]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
watchdog: remove timeout setting in open call
authorJeetesh Burman <jburman@nvidia.com>
Tue, 29 Dec 2015 09:59:40 +0000 (15:29 +0530)
committerMatthew Pedro <mapedro@nvidia.com>
Tue, 12 Jan 2016 16:21:18 +0000 (08:21 -0800)
timeout should not be set as part of open call.
It should be set as part of Probe if watchdog enabled on
probe, Otherwise timeout should be 0 since watchdog is not enabled.

Bug 200160105

Change-Id: I2bc0f35436dafd01d17e3ea2ec5459fd0d75af5a
Signed-off-by: Jeetesh Burman <jburman@nvidia.com>
Reviewed-on: http://git-master/r/927429
Reviewed-by: Bibek Basu <bbasu@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
drivers/watchdog/tegra_wdt.c

index 59a4100385699650d85bd8aa6fa08255111b45bc..bf90d7f8c9324de9f3b998320f8afb6932f72a95 100644 (file)
@@ -339,7 +339,6 @@ static int tegra_wdt_open(struct inode *inode, struct file *file)
                return -EBUSY;
 
        wdt->status |= WDT_ENABLED;
-       wdt->timeout = heartbeat;
        tegra_wdt_enable(wdt);
        file->private_data = wdt;
        return nonseekable_open(inode, file);