summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>2014-03-14 18:22:09 +0100
committerTejun Heo <tj@kernel.org>2014-03-14 14:30:28 -0400
commit5434b203156ef245b7847128c446c5b54f12a6d4 (patch)
tree25b5c5da0cb2f3cb126058f027ba69834841af65 /drivers/ata
parent13e8e78bdd148f615da1e5d1edcf0b58b7c2b684 (diff)
downloadop-kernel-dev-5434b203156ef245b7847128c446c5b54f12a6d4.zip
op-kernel-dev-5434b203156ef245b7847128c446c5b54f12a6d4.tar.gz
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>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/ahci_platform.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c
index db24d2a..70fbf66 100644
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
@@ -199,8 +199,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;
@@ -219,8 +218,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;
}
OpenPOWER on IntegriCloud