summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoe <joe@FreeBSD.org>2002-04-01 13:28:49 +0000
committerjoe <joe@FreeBSD.org>2002-04-01 13:28:49 +0000
commit44891868e6b7a16d772a9ce0ff506edafbf21bb7 (patch)
tree6e0f43cc16ed5242dc729397c27313f3a9ccdc9b
parent72fef638b5f857f03ced53f9e73ab4198440c44f (diff)
downloadFreeBSD-src-44891868e6b7a16d772a9ce0ff506edafbf21bb7.zip
FreeBSD-src-44891868e6b7a16d772a9ce0ff506edafbf21bb7.tar.gz
Merge from NetBSD:
---------------------------- revision 1.90 date: 2000/05/08 18:28:46; author: thorpej; lines: +8 -3 Quiet some uninitialized variable warnings that do in fact look legitimate. ----------------------------
-rw-r--r--sys/dev/usb/ohci.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index e63bf5b..21d8c60 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.88 2000/04/25 14:28:13 augustss Exp $ */
+/* $NetBSD: ohci.c,v 1.90 2000/05/08 18:28:46 thorpej Exp $ */
/* $FreeBSD$ */
/*
@@ -1860,6 +1860,9 @@ ohci_open(usbd_pipe_handle pipe)
DPRINTFN(1, ("ohci_open: pipe=%p, addr=%d, endpt=%d (%d)\n",
pipe, addr, ed->bEndpointAddress, sc->sc_addr));
+ std = NULL;
+ sed = NULL;
+
if (addr == sc->sc_addr) {
switch (ed->bEndpointAddress) {
case USB_CONTROL_ENDPOINT:
@@ -1939,9 +1942,11 @@ ohci_open(usbd_pipe_handle pipe)
return (USBD_NORMAL_COMPLETION);
bad:
- ohci_free_std(sc, std);
+ if (std != NULL)
+ ohci_free_std(sc, std);
bad1:
- ohci_free_sed(sc, sed);
+ if (sed != NULL)
+ ohci_free_sed(sc, sed);
bad0:
return (USBD_NOMEM);
OpenPOWER on IntegriCloud