target/linux/ipq806x/patches/0122-ata-ahci_platform-fix-devm_ioremap_resource-return-v.patch

   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()
   5  return value checking
   6
   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.
  10
  11 Also while at it remove a needless line break.
  12
  13 Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  14 Signed-off-by: Tejun Heo <tj@kernel.org>
  15 ---
  16  drivers/ata/ahci_platform.c |    6 +++---
  17  1 file changed, 3 insertions(+), 3 deletions(-)
  18
  19 --- a/drivers/ata/ahci_platform.c
  20 +++ b/drivers/ata/ahci_platform.c
  21 @@ -199,8 +199,7 @@ static void ahci_platform_put_resources(
  22   * RETURNS:
  23   * The allocated ahci_host_priv on success, otherwise an ERR_PTR value
  24   */
  25 -struct ahci_host_priv *ahci_platform_get_resources(
  26 -       struct platform_device *pdev)
  27 +struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev)
  28  {
  29         struct device *dev = &pdev->dev;
  30         struct ahci_host_priv *hpriv;
  31 @@ -219,8 +218,9 @@ struct ahci_host_priv *ahci_platform_get
  32
  33         hpriv->mmio = devm_ioremap_resource(dev,
  34                               platform_get_resource(pdev, IORESOURCE_MEM, 0));
  35 -       if (!hpriv->mmio) {
  36 +       if (IS_ERR(hpriv->mmio)) {
  37                 dev_err(dev, "no mmio space\n");
  38 +               rc = PTR_ERR(hpriv->mmio);
  39                 goto err_out;
  40         }
  41