summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/ipaq-micro.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mfd/ipaq-micro.c b/drivers/mfd/ipaq-micro.c
index 1763d6d..5d08daf 100644
--- a/drivers/mfd/ipaq-micro.c
+++ b/drivers/mfd/ipaq-micro.c
@@ -403,17 +403,17 @@ static int micro_probe(struct platform_device *pdev)
if (!res)
return -EINVAL;
- micro->base = devm_request_and_ioremap(&pdev->dev, res);
- if (!micro->base)
- return -ENOMEM;
+ micro->base = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(micro->base))
+ return PTR_ERR(micro->base);
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (!res)
return -EINVAL;
- micro->sdlc = devm_request_and_ioremap(&pdev->dev, res);
- if (!micro->sdlc)
- return -ENOMEM;
+ micro->sdlc = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(micro->sdlc))
+ return PTR_ERR(micro->sdlc);
micro_reset_comm(micro);
OpenPOWER on IntegriCloud