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

Commit 0197c1c4 authored by Wim Van Sebroeck's avatar Wim Van Sebroeck
Browse files

watchdog: fix set_timeout operations 



Since we changed the behaviour of the set_timeout operation in the
watchdog API, we need to change the allready converted drivers so
that they update the timeout field at the end of the set_timeout
operation.

Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent b10f7c12

drivers/staging/mei/wd.c

+1 −0
Original line number Diff line number Diff line
@@ -323,6 +323,7 @@ static int mei_wd_ops_set_timeout(struct watchdog_device *wd_dev, unsigned int t 
	mutex_lock(&dev->device_lock);



	dev->wd_timeout = timeout;

	wd_dev->timeout = timeout;

	mei_wd_set_start_timeout(dev, dev->wd_timeout);



	mutex_unlock(&dev->device_lock);

drivers/watchdog/jz4740_wdt.c

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ static int jz4740_wdt_set_timeout(struct watchdog_device *wdt_dev, 


	writeb(0x1, drvdata->base + JZ_REG_WDT_COUNTER_ENABLE);



	wdt_dev->timeout = new_timeout;

	return 0;

}

drivers/watchdog/pnx4008_wdt.c

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ static int pnx4008_wdt_stop(struct watchdog_device *wdd) 
static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd,

				    unsigned int new_timeout)

{

	wdd->timeout = new_timeout;

	return 0;

}

drivers/watchdog/s3c2410_wdt.c

+2 −0
Original line number Diff line number Diff line
@@ -201,6 +201,8 @@ static int s3c2410wdt_set_heartbeat(struct watchdog_device *wdd, unsigned timeou 
	writel(count, wdt_base + S3C2410_WTDAT);

	writel(wtcon, wdt_base + S3C2410_WTCON);



	wdd->timeout = timeout;



	return 0;

}

drivers/watchdog/via_wdt.c

+3 −3
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static void wdt_timer_tick(unsigned long data) 
static int wdt_ping(struct watchdog_device *wdd)

{

	/* calculate when the next userspace timeout will be */

	next_heartbeat = jiffies + timeout * HZ;

	next_heartbeat = jiffies + wdd->timeout * HZ;

	return 0;

}
@@ -109,7 +109,7 @@ static int wdt_start(struct watchdog_device *wdd) 
{

	unsigned int ctl = readl(wdt_mem);



	writel(timeout, wdt_mem + VIA_WDT_COUNT);

	writel(wdd->timeout, wdt_mem + VIA_WDT_COUNT);

	writel(ctl | VIA_WDT_RUNNING | VIA_WDT_TRIGGER, wdt_mem);

	wdt_ping(wdd);

	mod_timer(&timer, jiffies + WDT_HEARTBEAT);
@@ -128,7 +128,7 @@ static int wdt_set_timeout(struct watchdog_device *wdd, 
			   unsigned int new_timeout)

{

	writel(new_timeout, wdt_mem + VIA_WDT_COUNT);

	timeout = new_timeout;

	wdd->timeout = new_timeout;

	return 0;

}