Module Name: src
Committed By: martin
Date: Tue Jan 28 13:43:33 UTC 2014
Modified Files:
src/sys/dev/usb: uvideo.c
Log Message:
Initialize a variable earlier, so it is not used unitialized in an
error path.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/uvideo.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/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.39 src/sys/dev/usb/uvideo.c:1.40
--- src/sys/dev/usb/uvideo.c:1.39 Thu Oct 17 21:07:37 2013
+++ src/sys/dev/usb/uvideo.c Tue Jan 28 13:43:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.39 2013/10/17 21:07:37 christos Exp $ */
+/* $NetBSD: uvideo.c,v 1.40 2014/01/28 13:43:33 martin Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.39 2013/10/17 21:07:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.40 2014/01/28 13:43:33 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_uvideo.h"
@@ -797,6 +797,8 @@ uvideo_init_control(struct uvideo_softc
return USBD_NORMAL_COMPLETION;
}
+ i = 0;
+
/* allocate space for units */
sc->sc_nunits = nunits;
sc->sc_unit = kmem_alloc(sizeof(*sc->sc_unit) * nunits, KM_SLEEP);
@@ -807,7 +809,6 @@ uvideo_init_control(struct uvideo_softc
memcpy(iter, &orig, sizeof(orig));
/* iterate again, initializing the units */
- i = 0;
while ((desc = usb_desc_iter_next_non_interface(iter)) != NULL) {
uvdesc = (const uvideo_descriptor_t *)desc;
