Merge branch 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / drivers / watchdog / mv64x60_wdt.c

diff --git a/drivers/watchdog/mv64x60_wdt.c b/drivers/watchdog/mv64x60_wdt.c
index c7fb878ca4935a338c52c7315eb226e1bc76316c..e4cf980192658fa1d02959ba55e69ec03dc24ea0 100644 (file)
--- a/drivers/watchdog/mv64x60_wdt.c
+++ b/drivers/watchdog/mv64x60_wdt.c
@@ -276,7 +276,7 @@ static int mv64x60_wdt_probe(struct platform_device *dev)
        if (!r)
                return -ENODEV;
 
-       mv64x60_wdt_regs = ioremap(r->start, resource_size(r));
+       mv64x60_wdt_regs = devm_ioremap(&dev->dev, r->start, resource_size(r));
        if (mv64x60_wdt_regs == NULL)
                return -ENOMEM;
 
@@ -293,8 +293,6 @@ static int mv64x60_wdt_remove(struct platform_device *dev)
 
        mv64x60_wdt_handler_disable();
 
-       iounmap(mv64x60_wdt_regs);
-
        return 0;
 }