The patch titled
Subject: drivers/rtc/rtc-at91rm9200.c: fix missing iounmap
has been removed from the -mm tree. Its filename was
drivers-rtc-rtc-at91rm9200c-fix-missing-iounmap.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Johan Hovold <[email protected]>
Subject: drivers/rtc/rtc-at91rm9200.c: fix missing iounmap
Add missing iounmap to probe error path and remove.
Signed-off-by: Johan Hovold <[email protected]>
Acked-by: Nicolas Ferre <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---
drivers/rtc/rtc-at91rm9200.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff -puN
drivers/rtc/rtc-at91rm9200.c~drivers-rtc-rtc-at91rm9200c-fix-missing-iounmap
drivers/rtc/rtc-at91rm9200.c
---
a/drivers/rtc/rtc-at91rm9200.c~drivers-rtc-rtc-at91rm9200c-fix-missing-iounmap
+++ a/drivers/rtc/rtc-at91rm9200.c
@@ -299,7 +299,7 @@ static int __init at91_rtc_probe(struct
"at91_rtc", pdev);
if (ret) {
dev_err(&pdev->dev, "IRQ %d already in use.\n", irq);
- return ret;
+ goto err_unmap;
}
/* cpu init code should really have flagged this device as
@@ -311,13 +311,20 @@ static int __init at91_rtc_probe(struct
rtc = rtc_device_register(pdev->name, &pdev->dev,
&at91_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc)) {
- free_irq(irq, pdev);
- return PTR_ERR(rtc);
+ ret = PTR_ERR(rtc);
+ goto err_free_irq;
}
platform_set_drvdata(pdev, rtc);
dev_info(&pdev->dev, "AT91 Real Time Clock driver.\n");
return 0;
+
+err_free_irq:
+ free_irq(irq, pdev);
+err_unmap:
+ iounmap(at91_rtc_regs);
+
+ return ret;
}
/*
@@ -334,6 +341,7 @@ static int __exit at91_rtc_remove(struct
free_irq(irq, pdev);
rtc_device_unregister(rtc);
+ iounmap(at91_rtc_regs);
platform_set_drvdata(pdev, NULL);
return 0;
_
Patches currently in -mm which might be from [email protected] are
origin.patch
linux-next.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
