Module Name: src
Committed By: gsutre
Date: Sun Sep 9 20:23:38 UTC 2012
Modified Files:
src/sys/dev/usb: uhub.c
Log Message:
In uhub_childdet, do not free the array of sub-devices if there is none.
This prevents a kernel panic at shutdown on my laptop.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/dev/usb/uhub.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/uhub.c
diff -u src/sys/dev/usb/uhub.c:1.117 src/sys/dev/usb/uhub.c:1.118
--- src/sys/dev/usb/uhub.c:1.117 Mon Mar 12 02:44:17 2012
+++ src/sys/dev/usb/uhub.c Sun Sep 9 20:23:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uhub.c,v 1.117 2012/03/12 02:44:17 mrg Exp $ */
+/* $NetBSD: uhub.c,v 1.118 2012/09/09 20:23:38 gsutre Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhub.c,v 1.18 1999/11/17 22:33:43 n_hibma Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.117 2012/03/12 02:44:17 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhub.c,v 1.118 2012/09/09 20:23:38 gsutre Exp $");
#include "opt_usb.h"
@@ -671,7 +671,7 @@ uhub_childdet(device_t self, device_t ch
nports = devhub->hub->hubdesc.bNbrPorts;
for (port = 0; port < nports; port++) {
dev = devhub->hub->ports[port].device;
- if (!dev)
+ if (!dev || dev->subdevlen == 0)
continue;
for (i = 0; i < dev->subdevlen; i++) {
if (dev->subdevs[i] == child) {
