]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
watchdog: da9055: Don't update wdt_dev->timeout in da9055_wdt_set_timeout error path
authorAxel Lin <axel.lin@ingics.com>
Sat, 22 Dec 2012 03:07:01 +0000 (11:07 +0800)
committerWim Van Sebroeck <wim@iguana.be>
Wed, 2 Jan 2013 11:06:49 +0000 (12:06 +0100)
commit98e4a293895dda2b74476ac3a9f79c58b5d0155a
treed79ceba10dcf42c5c416b685aa80b2f047054d6b
parentee8c94adff9bd8609e70fb2ecdfaa71f561ed40d
watchdog: da9055: Don't update wdt_dev->timeout in da9055_wdt_set_timeout error path

Otherwise, WDIOC_GETTIMEOUT returns wrong value if set_timeout fails.
This patch also removes unnecessary ret variable in da9055_wdt_ping function.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/da9055_wdt.c