aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorArnaud Patard <arnaud.patard@rtp-net.org>2007-05-05 09:53:15 -0400
committerWim Van Sebroeck <wim@iguana.be>2007-05-06 15:36:28 -0400
commit62be074147fe2e24359d76a33938df7bccea1e6a (patch)
tree97507febe57bf540df109c906b7d2c1b42eef401 /drivers/char
parent261259b2a8c2924cbe591697e740654734ec0f7b (diff)
[WATCHDOG] s3c2410_wdt - initialize watchdog irq resource
In the error path of s3c2410wdt_probe() and in s3c2410wdt_remove(), we're using wdt_irq without initialising it, leading to a oops. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/watchdog/s3c2410_wdt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/watchdog/s3c2410_wdt.c b/drivers/char/watchdog/s3c2410_wdt.c
index dff6cb5dc9a7..20fa29ca7404 100644
--- a/drivers/char/watchdog/s3c2410_wdt.c
+++ b/drivers/char/watchdog/s3c2410_wdt.c
@@ -379,14 +379,14 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
379 379
380 DBG("probe: mapped wdt_base=%p\n", wdt_base); 380 DBG("probe: mapped wdt_base=%p\n", wdt_base);
381 381
382 res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); 382 wdt_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
383 if (res == NULL) { 383 if (wdt_irq == NULL) {
384 printk(KERN_INFO PFX "failed to get irq resource\n"); 384 printk(KERN_INFO PFX "failed to get irq resource\n");
385 ret = -ENOENT; 385 ret = -ENOENT;
386 goto err_map; 386 goto err_map;
387 } 387 }
388 388
389 ret = request_irq(res->start, s3c2410wdt_irq, 0, pdev->name, pdev); 389 ret = request_irq(wdt_irq->start, s3c2410wdt_irq, 0, pdev->name, pdev);
390 if (ret != 0) { 390 if (ret != 0) {
391 printk(KERN_INFO PFX "failed to install irq (%d)\n", ret); 391 printk(KERN_INFO PFX "failed to install irq (%d)\n", ret);
392 goto err_map; 392 goto err_map;