rtc: rtc-at91rm9200: fix missing iounmap
PATCH 1/1 rtc: rtc-at91rm9200: fix missing iounmap
Add missing iounmap to probe error path and remove.
Cc stable <[email protected]>
Signed-off-by Johan Hovold <[email protected]>
--- drivers/rtc/rtc-at91rm9200.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)
drivers/rtc/rtc-at91rm9200.c +11 -3
@@ -297,7 +297,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev) "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
@@ -309,13 +309,20 @@ static int __init at91_rtc_probe(struct platform_device *pdev) 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; }/*
@@ -332,6 +339,7 @@ static int __exit at91_rtc_remove(struct platform_device *pdev)free_irq (irq, pdev);rtc_device_unregister (rtc); +iounmap (at91_rtc_regs);platform_set_drvdata (pdev,NULL );return 0 ;
Signature · 1 line
1.8.1.5
On 04/11/2013 04:38 PM, Johan Hovold :
Quoted 4 lines
Add missing iounmap to probe error path and remove.
Cc stable <[email protected]>Signed-off-by Johan Hovold <[email protected]>
Acked-by Nicolas Ferre <[email protected]>
Andrew, can you take this one please?
(https://patchwork.kernel.org/patch/2429031/)
Best regards,
Quoted 49 lines
--- drivers/rtc/rtc-at91rm9200.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-)drivers/rtc/rtc-at91rm9200.c +11
-3@@ -297,7 +297,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev) "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 @@ -309,13 +309,20 @@ static int __init at91_rtc_probe(struct platform_device *pdev) 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; }/* @@ -332,6 +339,7 @@ static int __exit at91_rtc_remove(struct platform_device *pdev)free_irq (irq, pdev);rtc_device_unregister (rtc); +iounmap (at91_rtc_regs);platform_set_drvdata (pdev,NULL );return 0 ;
Signature · 1 line
Nicolas Ferre