]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ata: ahci_platform: fix devm_ioremap_resource() return value checking
authorBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Fri, 14 Mar 2014 17:22:09 +0000 (18:22 +0100)
committerNitin Garg <nitin.garg@freescale.com>
Fri, 16 Jan 2015 03:17:21 +0000 (21:17 -0600)
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>
(cherry picked from commit 5434b203156ef245b7847128c446c5b54f12a6d4)

drivers/ata/ahci_platform.c

index ba63c2e4cb46dae6c713622f67c776fe6b2c121d..0ce3f1105528761a2d4bc3c62d62cfdd2c9804f4 100644 (file)
@@ -200,8 +200,7 @@ static void ahci_platform_put_resources(struct device *dev, void *res)
  * 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;
@@ -220,8 +219,9 @@ struct ahci_host_priv *ahci_platform_get_resources(
 
        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;
        }