summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-31 08:47:48 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-09-16 08:32:09 +0200
commit9d518ba397712add7fa06ff3ab056a26a3c46de6 (patch)
treeda8fbe4537c39f433b6868b7733bbc2e34250378 /drivers/ata
parentdde56d42ad1763dd81a3de65b74d7387d12f6fa9 (diff)
downloadbarebox-9d518ba397712add7fa06ff3ab056a26a3c46de6.tar.gz
barebox-9d518ba397712add7fa06ff3ab056a26a3c46de6.tar.xz
resource: Let dev_get_resource return an error pointer
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/intf_platform_ide.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c
index db4c35611d..851f8f5c5b 100644
--- a/drivers/ata/intf_platform_ide.c
+++ b/drivers/ata/intf_platform_ide.c
@@ -97,8 +97,8 @@ static int platform_ide_probe(struct device_d *dev)
alt_base = dev_request_mem_region(dev, 1);
} else {
reg = dev_get_resource(dev, IORESOURCE_IO, 0);
- if (!reg)
- return -ENODEV;
+ if (IS_ERR(reg))
+ return PTR_ERR(reg);
reg = request_ioport_region(dev_name(dev), reg->start,
reg->end);
@@ -108,7 +108,7 @@ static int platform_ide_probe(struct device_d *dev)
reg_base = (void __force __iomem *) reg->start;
alt = dev_get_resource(dev, IORESOURCE_IO, 1);
- if (alt) {
+ if (!IS_ERR(alt)) {
alt = request_ioport_region(dev_name(dev),
alt->start,
alt->end);