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

Commit 655516c8 authored by Ben Dooks's avatar Ben Dooks Committed by Wim Van Sebroeck
Browse files

[WATCHDOG] s3c2410_wdt.c stop watchdog after boot 



If the s3c2410 watchdog timer is not enabled by
the driver at startup, ensure that it is stopped
in-case the boot process has enabled it.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent 03a8e359

drivers/char/watchdog/s3c2410_wdt.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -423,6 +423,12 @@ static int s3c2410wdt_probe(struct platform_device *pdev) 
	if (tmr_atboot && started == 0) {

	if (tmr_atboot && started == 0) {

		printk(KERN_INFO PFX "Starting Watchdog Timer\n");

		printk(KERN_INFO PFX "Starting Watchdog Timer\n");

		s3c2410wdt_start();

		s3c2410wdt_start();

	} else if (!tmr_atboot) {

		/* if we're not enabling the watchdog, then ensure it is

		 * disabled if it has been left running from the bootloader

		 * or other source */



		s3c2410wdt_stop();

	}

	}





	return 0;

	return 0;