summaryrefslogtreecommitdiff
path: root/sys/dev/usb/if_wi_usb.c
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2010-07-02 03:13:43 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2010-07-02 03:13:43 +0000
commit17df78769e62888f697709e91fae01a5c354c560 (patch)
tree8258930e0858437535987e229e45757b9fb0fe34 /sys/dev/usb/if_wi_usb.c
parent6d99ced538a18cfb44f9fa76abd032b12114620d (diff)
fix a variety of uninit errors. ok and one correction deraadt
Diffstat (limited to 'sys/dev/usb/if_wi_usb.c')
-rw-r--r--sys/dev/usb/if_wi_usb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index 11cc4cced0d..ba2834948e2 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_usb.c,v 1.46 2009/10/13 19:33:17 pirofti Exp $ */
+/* $OpenBSD: if_wi_usb.c,v 1.47 2010/07/02 03:13:42 tedu Exp $ */
/*
* Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -459,7 +459,7 @@ wi_usb_detach(struct device *self, int flags)
sc->wi_usb_ep[WI_USB_ENDPT_INTR] = NULL;
}
if (sc->wi_usb_ep[WI_USB_ENDPT_TX] != NULL) {
- usbd_abort_pipe(sc->wi_usb_ep[WI_USB_ENDPT_TX]);
+ err = usbd_abort_pipe(sc->wi_usb_ep[WI_USB_ENDPT_TX]);
if (err) {
printf("%s: abort tx pipe failed: %s\n",
sc->wi_usb_dev.dv_xname, usbd_errstr(err));
@@ -472,7 +472,7 @@ wi_usb_detach(struct device *self, int flags)
sc->wi_usb_ep[WI_USB_ENDPT_TX] = NULL;
}
if (sc->wi_usb_ep[WI_USB_ENDPT_RX] != NULL) {
- usbd_abort_pipe(sc->wi_usb_ep[WI_USB_ENDPT_RX]);
+ err = usbd_abort_pipe(sc->wi_usb_ep[WI_USB_ENDPT_RX]);
if (err) {
printf("%s: abort rx pipe failed: %s\n",
sc->wi_usb_dev.dv_xname, usbd_errstr(err));
@@ -657,7 +657,7 @@ wi_read_record_usb(struct wi_softc *wsc, struct wi_ltv_gen *ltv)
struct wi_rridreq *prid;
int total_len, rnd_len;
int err;
- struct wi_ltv_gen *oltv, p2ltv;
+ struct wi_ltv_gen *oltv = NULL, p2ltv;
DPRINTFN(5,("%s: %s: enter rid=%x\n",
sc->wi_usb_dev.dv_xname, __func__, ltv->wi_type));