1 From 0db91c83bcb5f7307aaa16c093b8c6bb3f44be52 Mon Sep 17 00:00:00 2001
2 From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
3 Date: Fri, 14 Mar 2014 18:22:09 +0100
4 Subject: [PATCH 122/182] ata: ahci_platform: fix devm_ioremap_resource()
7 devm_ioremap_resource() returns a pointer to the remapped memory or
8 an ERR_PTR() encoded error code on failure. Fix the check inside
9 ahci_platform_get_resources() accordingly.
11 Also while at it remove a needless line break.
13 Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
14 Signed-off-by: Tejun Heo <tj@kernel.org>
16 drivers/ata/ahci_platform.c | 6 +++---
17 1 file changed, 3 insertions(+), 3 deletions(-)
19 diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
20 index db24d2a..70fbf66 100644
21 --- a/drivers/ata/ahci_platform.c
22 +++ b/drivers/ata/ahci_platform.c
23 @@ -199,8 +199,7 @@ static void ahci_platform_put_resources(struct device *dev, void *res)
25 * The allocated ahci_host_priv on success, otherwise an ERR_PTR value
27 -struct ahci_host_priv *ahci_platform_get_resources(
28 - struct platform_device *pdev)
29 +struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev)
31 struct device *dev = &pdev->dev;
32 struct ahci_host_priv *hpriv;
33 @@ -219,8 +218,9 @@ struct ahci_host_priv *ahci_platform_get_resources(
35 hpriv->mmio = devm_ioremap_resource(dev,
36 platform_get_resource(pdev, IORESOURCE_MEM, 0));
38 + if (IS_ERR(hpriv->mmio)) {
39 dev_err(dev, "no mmio space\n");
40 + rc = PTR_ERR(hpriv->mmio);