diff options
| -rw-r--r-- | sys/dev/onewire/onewire_bitbang.c | 3 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_malo.c | 3 | ||||
| -rw-r--r-- | sys/dev/pcmcia/if_ray.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/if_rum.c | 3 | ||||
| -rw-r--r-- | sys/dev/usb/if_wi_usb.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/uvisor.c | 4 |
6 files changed, 15 insertions, 10 deletions
diff --git a/sys/dev/onewire/onewire_bitbang.c b/sys/dev/onewire/onewire_bitbang.c index 348fb67c4f1..a6a246cc448 100644 --- a/sys/dev/onewire/onewire_bitbang.c +++ b/sys/dev/onewire/onewire_bitbang.c @@ -1,4 +1,4 @@ -/* $OpenBSD: onewire_bitbang.c,v 1.1 2006/03/04 16:27:03 grange Exp $ */ +/* $OpenBSD: onewire_bitbang.c,v 1.2 2010/07/02 03:13:42 tedu Exp $ */ /* * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org> @@ -58,6 +58,7 @@ onewire_bb_bit(const struct onewire_bbops *ops, void *arg, int value) ops->bb_tx(arg); ops->bb_set(arg, 0); DELAY(2); + rv = 0; if (value) { ops->bb_set(arg, 1); ops->bb_rx(arg); diff --git a/sys/dev/pcmcia/if_malo.c b/sys/dev/pcmcia/if_malo.c index 79a8b6d1f01..7394617fd4e 100644 --- a/sys/dev/pcmcia/if_malo.c +++ b/sys/dev/pcmcia/if_malo.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_malo.c,v 1.68 2010/05/20 14:03:05 nicm Exp $ */ +/* $OpenBSD: if_malo.c,v 1.69 2010/07/02 03:13:42 tedu Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -559,6 +559,7 @@ cmalo_fw_load_main(struct malo_softc *sc) DPRINTF(1, "%s: helper FW loaded successfully\n", sc->sc_dev.dv_xname); /* download the main firmware */ + bsize = 0; /* XXX really??? */ for (offset = 0; offset < sc->sc_fw_m_size; offset += bsize) { val16 = MALO_READ_2(sc, MALO_REG_RBAL); /* diff --git a/sys/dev/pcmcia/if_ray.c b/sys/dev/pcmcia/if_ray.c index ee2d67fb77b..73cbb309b5f 100644 --- a/sys/dev/pcmcia/if_ray.c +++ b/sys/dev/pcmcia/if_ray.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ray.c,v 1.40 2010/05/19 18:50:02 nicm Exp $ */ +/* $OpenBSD: if_ray.c,v 1.41 2010/07/02 03:13:42 tedu Exp $ */ /* $NetBSD: if_ray.c,v 1.21 2000/07/05 02:35:54 onoe Exp $ */ /* @@ -1211,6 +1211,8 @@ ray_intr_start(struct ray_softc *sc) } else if (et > ETHERMTU) { /* adjust for LLC/SNAP header */ tmplen= sizeof(struct ieee80211_frame) - ETHER_ADDR_LEN; + } else { + tmplen = 0; } /* now get our space for the 802.11 frame */ M_PREPEND(m0, tmplen, M_DONTWAIT); diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c index 6b8e018c6a4..ff7362bf973 100644 --- a/sys/dev/usb/if_rum.c +++ b/sys/dev/usb/if_rum.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_rum.c,v 1.88 2010/04/20 22:05:43 tedu Exp $ */ +/* $OpenBSD: if_rum.c,v 1.89 2010/07/02 03:13:42 tedu Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr> @@ -1991,6 +1991,7 @@ rum_init(struct ifnet *ifp) if (ntries == 1000) { printf("%s: timeout waiting for BBP/RF to wakeup\n", sc->sc_dev.dv_xname); + error = ENODEV; goto fail; } 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)); diff --git a/sys/dev/usb/uvisor.c b/sys/dev/usb/uvisor.c index 21dc17cf782..7776fae58fb 100644 --- a/sys/dev/usb/uvisor.c +++ b/sys/dev/usb/uvisor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uvisor.c,v 1.39 2009/10/13 19:33:19 pirofti Exp $ */ +/* $OpenBSD: uvisor.c,v 1.40 2010/07/02 03:13:42 tedu Exp $ */ /* $NetBSD: uvisor.c,v 1.21 2003/08/03 21:59:26 nathanw Exp $ */ /* @@ -425,7 +425,7 @@ usbd_status uvisor_init(struct uvisor_softc *sc, struct uvisor_connection_info *ci, struct uvisor_palm_connection_info *cpi) { - usbd_status err; + usbd_status err = 0; usb_device_request_t req; int actlen; uWord avail; |