Commit 80060362 authored Oct 10, 2006 by Jeff Garzik Committed by Wim Van Sebroeck Oct 11, 2006

[WATCHDOG] watchdog/iTCO_wdt: fix bug related to gcc uninit warning



gcc emits the following warning:

drivers/char/watchdog/iTCO_wdt.c: In function ‘iTCO_wdt_ioctl’:
drivers/char/watchdog/iTCO_wdt.c:429: warning: ‘time_left’ may be used uninitialized in this function

This indicates a condition near enough to a bug, to want to fix.
iTCO_wdt_get_timeleft() stores a value in 'time_left' iff
iTCO_version==(1 or 2).  This driver only supports versions
1 or 2, so this is ok.  However, since (a) the return value of
iTCO_wdt_get_timeleft() is handled anyway, (b) it fixes the warning,
and (c) it future-proofs the driver, we go ahead and add the obvious
return value.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>

parent a8edd74e

drivers/char/watchdog/iTCO_wdt.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -368,7 +368,8 @@ static int iTCO_wdt_get_timeleft (int *time_left)
		spin_unlock(&iTCO_wdt_private.io_lock);

		time_left = (val8 6) / 10;
		}
		} else
		return -EINVAL;
		return 0;
		}

		@@ -439,7 +440,6 @@ static int iTCO_wdt_ioctl (struct inode inode, struct file file,
		{
		int new_options, retval = -EINVAL;
		int new_heartbeat;
		int time_left;
		void __user argp = (void __user )arg;
		int __user *p = argp;
		static struct watchdog_info ident = {
		@@ -499,6 +499,8 @@ static int iTCO_wdt_ioctl (struct inode inode, struct file file,

		case WDIOC_GETTIMELEFT:
		{
		int time_left;

		if (iTCO_wdt_get_timeleft(&time_left))
		return -EINVAL;