ioremap balanced with iounmap for drivers/char/watchdog/s3c2410_wdt.c
Subsystems (2)
PATCH 5/5 ioremap balanced with iounmap for drivers/char/watchdog/s3c2410_wdt.c
--- s3c2410_wdt.c | 5 +++++ 1 files changed, 5 insertions(+)
---
drivers/char/watchdog/s3c2410_wdt.c +5 -0
@@ -381,18 +381,21 @@ static int s3c2410wdt_probe(struct platf res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 );if (res ==NULL ) { printk(KERN_INFO PFX "failed to get irq resource\n"); +iounmap (wdt_base);return -ENOENT ; } ret =request_irq (res->start, s3c2410wdt_irq,0 , pdev->name, pdev);if (ret !=0 ) { printk(KERN_INFO PFX "failed to install irq (%d)\n", ret); +iounmap (wdt_base);return ret; } wdt_clock =clk_get (&pdev->dev,"watchdog" );if (wdt_clock ==NULL ) { printk(KERN_INFO PFX "failed to find watchdog clock source\n"); +iounmap (wdt_base);return -ENOENT ; }
@@ -416,6 +419,7 @@ static int s3c2410wdt_probe(struct platfif (ret) { printk (KERN_ERR PFX "cannot register miscdev on minor=%d (%d)\n", WATCHDOG_MINOR, ret); +iounmap (wdt_base);return ret; }
@@ -452,6 +456,7 @@ static int s3c2410wdt_remove(struct plat wdt_clock =NULL ; } +iounmap (wdt_base);misc_deregister (&s3c2410wdt_miscdev);return 0 ; }
Quoted 31 lines · On Fri, 06 Oct 2006 10:27:07 +0530 Amol Lad <[email protected]> wrote:
Signed-off-by Amol Lad <[email protected]>--- s3c2410_wdt.c | 5 +++++ 1 files changed, 5 insertions(+)---
diff -uprN -X linux-2.6.19-rc1-orig/Documentation/dontdifflinux-2.6.19-rc1-orig/drivers/char/watchdog/s3c2410_wdt.clinux-2.6.19-rc1/drivers/char/watchdog/s3c2410_wdt.cdrivers/char/watchdog/s3c2410_wdt.c +3
-0@@ -381,18 +381,21 @@ static int s3c2410wdt_probe(struct platf res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 );if (res ==NULL ) { printk(KERN_INFO PFX "failed to get irq resource\n"); +iounmap (wdt_base);return -ENOENT ; } ret =request_irq (res->start, s3c2410wdt_irq,0 , pdev->name, pdev);if (ret !=0 ) { printk(KERN_INFO PFX "failed to install irq (%d)\n", ret); +iounmap (wdt_base);return ret; } wdt_clock =clk_get (&pdev->dev,"watchdog" );if (wdt_clock ==NULL ) { printk(KERN_INFO PFX "failed to find watchdog clock source\n"); +iounmap (wdt_base);return -ENOENT ; }
drivers/char/watchdog/s3c2410_wdt.c static int s3c2410wdt_probe(struct platf · line 425
Quoted 7 lines
drivers/char/watchdog/s3c2410_wdt.c +1
-0@@ -416,6 +419,7 @@ static int s3c2410wdt_probe(struct platfif (ret) { printk (KERN_ERR PFX "cannot register miscdev on minor=%d (%d)\n", WATCHDOG_MINOR, ret); +iounmap (wdt_base);return ret; }
barf. That function has to set the record for the number-of-return-statements-per-line. There are good reasons why we prefer to have a single return point at which to handle all the error unwinding, and the above patch illustrates one of them.
Sigh. Oh well, patch looks correct - I'll start spamming Wim with it, thanks.
Quoted 33 lines · Andrew Morton
Quoted 30 lines · On Fri, 06 Oct 2006 10:27:07 +0530 Amol Lad <[email protected]> wrote:
Signed-off-by Amol Lad <[email protected]>--- s3c2410_wdt.c | 5 +++++ 1 files changed, 5 insertions(+)---
diff -uprN -X linux-2.6.19-rc1-orig/Documentation/dontdifflinux-2.6.19-rc1-orig/drivers/char/watchdog/s3c2410_wdt.clinux-2.6.19-rc1/drivers/char/watchdog/s3c2410_wdt.cdrivers/char/watchdog/s3c2410_wdt.c +3
-0@@ -381,18 +381,21 @@ static int s3c2410wdt_probe(struct platf res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 );if (res ==NULL ) { printk(KERN_INFO PFX "failed to get irq resource\n"); +iounmap (wdt_base);return -ENOENT ; } ret =request_irq (res->start, s3c2410wdt_irq,0 , pdev->name, pdev);if (ret !=0 ) { printk(KERN_INFO PFX "failed to install irq (%d)\n", ret); +iounmap (wdt_base);return ret; } wdt_clock =clk_get (&pdev->dev,"watchdog" );if (wdt_clock ==NULL ) { printk(KERN_INFO PFX "failed to find watchdog clock source\n"); +iounmap (wdt_base);return -ENOENT ; }
Quoted 13 lines
drivers/char/watchdog/s3c2410_wdt.c static int s3c2410wdt_probe(struct platf · line 425
Quoted 8 lines
drivers/char/watchdog/s3c2410_wdt.c +1
-0@@ -416,6 +419,7 @@ static int s3c2410wdt_probe(struct platfif (ret) { printk (KERN_ERR PFX "cannot register miscdev on minor=%d (%d)\n", WATCHDOG_MINOR, ret); +iounmap (wdt_base);return ret; }barf. That function has to set the record for the number-of-return-statements-per-line. There are good reasons why we prefer to have a single return point at which to handle all the error unwinding, and the above patch illustrates one of them.
I'll try and sort this out once 2.6.19 is out.
Signature · 3 lines
Ben ([email protected], http://www.fluff.org/) 'a smiley only costs 4 bytes'
Quoted 31 lines · On Fri, 06 Oct 2006 10:27:07 +0530 Amol Lad <[email protected]> wrote:
Signed-off-by Amol Lad <[email protected]>--- s3c2410_wdt.c | 5 +++++ 1 files changed, 5 insertions(+)---
diff -uprN -X linux-2.6.19-rc1-orig/Documentation/dontdifflinux-2.6.19-rc1-orig/drivers/char/watchdog/s3c2410_wdt.clinux-2.6.19-rc1/drivers/char/watchdog/s3c2410_wdt.cdrivers/char/watchdog/s3c2410_wdt.c +3
-0@@ -381,18 +381,21 @@ static int s3c2410wdt_probe(struct platf res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 );if (res ==NULL ) { printk(KERN_INFO PFX "failed to get irq resource\n"); +iounmap (wdt_base);return -ENOENT ; } ret =request_irq (res->start, s3c2410wdt_irq,0 , pdev->name, pdev);if (ret !=0 ) { printk(KERN_INFO PFX "failed to install irq (%d)\n", ret); +iounmap (wdt_base);return ret; } wdt_clock =clk_get (&pdev->dev,"watchdog" );if (wdt_clock ==NULL ) { printk(KERN_INFO PFX "failed to find watchdog clock source\n"); +iounmap (wdt_base);return -ENOENT ; }
drivers/char/watchdog/s3c2410_wdt.c static int s3c2410wdt_probe(struct platf · line 425
Quoted 7 lines
drivers/char/watchdog/s3c2410_wdt.c +1
-0@@ -416,6 +419,7 @@ static int s3c2410wdt_probe(struct platfif (ret) { printk (KERN_ERR PFX "cannot register miscdev on minor=%d (%d)\n", WATCHDOG_MINOR, ret); +iounmap (wdt_base);return ret; }
barf. That function has to set the record for the number-of-return-statements-per-line. There are good reasons why we prefer to have a single return point at which to handle all the error unwinding, and the above patch illustrates one of them.
Sigh. Oh well, patch looks correct - I'll start spamming Wim with it, thanks.
(Not that Wim - this Wim).
Hi All,
Quoted 9 lines
barf. That function has to set the record for the number-of-return-statements-per-line. There are good reasons why we prefer to have a single return point at which to handle all the error unwinding, and the above patch illustrates one of them.
Sigh. Oh well, patch looks correct - I'll start spamming Wim with it, thanks.
(Not that Wim - this Wim).
Added it to the linux-2.6-watchdog-mm tree.
Greetings,
Wim.