author: Thierry Reding <thierry.reding@avionic-design.de> 2013-01-21 11:08:57 +0100
committer: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2013-01-25 12:21:46 -0800
commit: 903b33e0292465ebe9705a70084bf9ad06a8a2a5
parent: 7c390a7e956b4bf7b7d6dba4dfb93299c4f0879a
Commit Summary:
Diffstat:
1 file changed, 4 insertions, 3 deletions
diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c
index 536c166f4253..ab92785f54dc 100644
--- a/drivers/amba/tegra-ahb.c
+++ b/drivers/amba/tegra-ahb.c
@@ -20,6 +20,7 @@
*
*/
+#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/platform_device.h>
@@ -257,9 +258,9 @@ static int tegra_ahb_probe(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res)
return -ENODEV;
- ahb->regs = devm_request_and_ioremap(&pdev->dev, res);
- if (!ahb->regs)
- return -EBUSY;
+ ahb->regs = devm_ioremap_resource(&pdev->dev, res);
+ if (IS_ERR(ahb->regs))
+ return PTR_ERR(ahb->regs);
ahb->dev = &pdev->dev;
platform_set_drvdata(pdev, ahb);