02629d8f87
Targets were build tested and patches are refreshed. Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 42463
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 0db91c83bcb5f7307aaa16c093b8c6bb3f44be52 Mon Sep 17 00:00:00 2001
|
|
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
|
|
Date: Fri, 14 Mar 2014 18:22:09 +0100
|
|
Subject: [PATCH 122/182] ata: ahci_platform: fix devm_ioremap_resource()
|
|
return value checking
|
|
|
|
devm_ioremap_resource() returns a pointer to the remapped memory or
|
|
an ERR_PTR() encoded error code on failure. Fix the check inside
|
|
ahci_platform_get_resources() accordingly.
|
|
|
|
Also while at it remove a needless line break.
|
|
|
|
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
|
|
Signed-off-by: Tejun Heo <tj@kernel.org>
|
|
---
|
|
drivers/ata/ahci_platform.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/ata/ahci_platform.c
|
|
+++ b/drivers/ata/ahci_platform.c
|
|
@@ -199,8 +199,7 @@ static void ahci_platform_put_resources(
|
|
* RETURNS:
|
|
* The allocated ahci_host_priv on success, otherwise an ERR_PTR value
|
|
*/
|
|
-struct ahci_host_priv *ahci_platform_get_resources(
|
|
- struct platform_device *pdev)
|
|
+struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev)
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
struct ahci_host_priv *hpriv;
|
|
@@ -219,8 +218,9 @@ struct ahci_host_priv *ahci_platform_get
|
|
|
|
hpriv->mmio = devm_ioremap_resource(dev,
|
|
platform_get_resource(pdev, IORESOURCE_MEM, 0));
|
|
- if (!hpriv->mmio) {
|
|
+ if (IS_ERR(hpriv->mmio)) {
|
|
dev_err(dev, "no mmio space\n");
|
|
+ rc = PTR_ERR(hpriv->mmio);
|
|
goto err_out;
|
|
}
|
|
|