diff options
| -rw-r--r-- | sys/dev/acpi/atk0110.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/if_urtwn.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/uticom.c | 6 | ||||
| -rw-r--r-- | sys/netinet/in_gif.c | 5 |
4 files changed, 10 insertions, 9 deletions
diff --git a/sys/dev/acpi/atk0110.c b/sys/dev/acpi/atk0110.c index 2e33d6896a7..d9d1630579f 100644 --- a/sys/dev/acpi/atk0110.c +++ b/sys/dev/acpi/atk0110.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atk0110.c,v 1.6 2010/09/21 01:10:24 claudio Exp $ */ +/* $OpenBSD: atk0110.c,v 1.7 2011/06/19 17:55:37 jsg Exp $ */ /* * Copyright (c) 2009 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru> @@ -275,7 +275,7 @@ aibs_add_sensor(struct aibs_softc *sc, char *name) if (aml_evalname(sc->sc_acpi, sc->sc_devnode, name, 0, NULL, &ri)) { printf("%s: aibs_add_sensor: %s not found\n", - DEVNAME(sc), name, name); + DEVNAME(sc), name); aml_freevalue(&ri); return; } diff --git a/sys/dev/usb/if_urtwn.c b/sys/dev/usb/if_urtwn.c index 0f7c3131ea3..302e6c28104 100644 --- a/sys/dev/usb/if_urtwn.c +++ b/sys/dev/usb/if_urtwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_urtwn.c,v 1.16 2011/02/10 17:26:40 jakemsr Exp $ */ +/* $OpenBSD: if_urtwn.c,v 1.17 2011/06/19 17:55:37 jsg Exp $ */ /*- * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> @@ -2222,7 +2222,7 @@ urtwn_load_firmware(struct urtwn_softc *sc) error = urtwn_fw_loadpage(sc, page, ptr, mlen); if (error != 0) { printf("%s: could not load firmware page %d\n", - sc->sc_dev.dv_xname); + sc->sc_dev.dv_xname, page); goto fail; } ptr += mlen; diff --git a/sys/dev/usb/uticom.c b/sys/dev/usb/uticom.c index 7bfe546e719..d47312415a8 100644 --- a/sys/dev/usb/uticom.c +++ b/sys/dev/usb/uticom.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uticom.c,v 1.15 2011/06/17 07:06:47 mk Exp $ */ +/* $OpenBSD: uticom.c,v 1.16 2011/06/19 17:55:37 jsg Exp $ */ /* * Copyright (c) 2005 Dmitry Komissaroff <dxi@mail.ru>. * @@ -357,7 +357,7 @@ fwload_done: err = usbd_device2interface_handle(sc->sc_udev, UTICOM_IFACE_INDEX, &sc->sc_iface); if (err) { - printf("failed to get interface: %s\n", + printf("%s: failed to get interface: %s\n", sc->sc_dev.dv_xname, usbd_errstr(err)); sc->sc_dying = 1; return; @@ -370,7 +370,7 @@ fwload_done: for (i = 0; i < id->bNumEndpoints; i++) { ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i); if (ed == NULL) { - printf("no endpoint descriptor for %d\n", + printf("%s: no endpoint descriptor for %d\n", sc->sc_dev.dv_xname, i); sc->sc_dying = 1; return; diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c index 3cf02f75490..0a36e50d098 100644 --- a/sys/netinet/in_gif.c +++ b/sys/netinet/in_gif.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_gif.c,v 1.38 2010/05/11 09:36:07 claudio Exp $ */ +/* $OpenBSD: in_gif.c,v 1.39 2011/06/19 17:55:37 jsg Exp $ */ /* $KAME: in_gif.c,v 1.50 2001/01/22 07:27:16 itojun Exp $ */ /* @@ -84,7 +84,8 @@ in_gif_output(struct ifnet *ifp, int family, struct mbuf **m0) if (ifp->if_rdomain != rtable_l2(m->m_pkthdr.rdomain)) { printf("%s: trying to send packet on wrong domain. " "if %d vs. mbuf %d, AF %d\n", ifp->if_xname, - ifp->if_rdomain, rtable_l2(m->m_pkthdr.rdomain)); + ifp->if_rdomain, rtable_l2(m->m_pkthdr.rdomain), + family); } #endif |