CVS commit: src/sys/dev/usb

[Manuel Bouyer]

Module Name:    src
Committed By:   bouyer
Date:           Thu Mar 15 18:39:21 UTC 2012

Modified Files:
        src/sys/dev/usb: if_zyd.c

Log Message:
Always init *val; some callers of zyd_read*() do not check the return
value for error. Found by gcc -O3


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/usb/if_zyd.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/usb/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.29 src/sys/dev/usb/if_zyd.c:1.30
--- src/sys/dev/usb/if_zyd.c:1.29	Mon Jul 18 05:57:40 2011
+++ src/sys/dev/usb/if_zyd.c	Thu Mar 15 18:39:21 2012
@@ -1,5 +1,5 @@
 /*	$OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $	*/
-/*	$NetBSD: if_zyd.c,v 1.29 2011/07/18 05:57:40 jruoho Exp $	*/
+/*	$NetBSD: if_zyd.c,v 1.30 2012/03/15 18:39:21 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergam...@free.fr>
@@ -22,7 +22,7 @@
  * ZyDAS ZD1211/ZD1211B USB WLAN driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.29 2011/07/18 05:57:40 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.30 2012/03/15 18:39:21 bouyer Exp $");
 
 
 #include <sys/param.h>
@@ -852,6 +852,8 @@ zyd_read16(struct zyd_softc *sc, uint16_
 	    ZYD_CMD_FLAG_READ);
 	if (error == 0)
 		*val = le16toh(tmp.val);
+	else
+		*val = 0;
 	return error;
 }
 
@@ -868,6 +870,8 @@ zyd_read32(struct zyd_softc *sc, uint16_
 	    ZYD_CMD_FLAG_READ);
 	if (error == 0)
 		*val = le16toh(tmp[0].val) << 16 | le16toh(tmp[1].val);
+	else
+		*val = 0;
 	return error;
 }