Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62be0741 authored by Arnaud Patard's avatar Arnaud Patard Committed by Wim Van Sebroeck
Browse files

[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: default avatarArnaud Patard <arnaud.patard@rtp-net.org>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 261259b2

drivers/char/watchdog/s3c2410_wdt.c

+3 −3
Original line number Diff line number Diff line
@@ -379,14 +379,14 @@ static int s3c2410wdt_probe(struct platform_device *pdev) 


	DBG("probe: mapped wdt_base=%p\n", wdt_base);



	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (res == NULL) {

	wdt_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (wdt_irq == NULL) {

		printk(KERN_INFO PFX "failed to get irq resource\n");

		ret = -ENOENT;

		goto err_map;

	}



	ret = request_irq(res->start, s3c2410wdt_irq, 0, pdev->name, pdev);

	ret = request_irq(wdt_irq->start, s3c2410wdt_irq, 0, pdev->name, pdev);

	if (ret != 0) {

		printk(KERN_INFO PFX "failed to install irq (%d)\n", ret);

		goto err_map;