Module Name: src
Committed By: skrll
Date: Thu Dec 27 16:42:33 UTC 2012
Modified Files:
src/sys/dev/usb: aubtfwl.c emdtv.c if_atu.c if_aue.c if_axe.c if_cue.c
if_kue.c if_otus.c if_rum.c if_run.c if_udav.c if_upgt.c if_upl.c
if_ural.c if_url.c if_urtw.c if_urtwn.c if_zyd.c uberry.c udl.c
udsbr.c uhso.c uipaq.c urio.c uscanner.c usscanner.c
Log Message:
Consistent/Correct error message from failing usbd_set_config.
Use aprint_error_dev.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/aubtfwl.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/emdtv.c src/sys/dev/usb/uberry.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/usb/if_atu.c src/sys/dev/usb/if_url.c
cvs rdiff -u -r1.127 -r1.128 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/usb/if_cue.c
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/usb/if_kue.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/usb/if_otus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/usb/if_rum.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/if_upgt.c src/sys/dev/usb/udl.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/usb/if_ural.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/if_urtw.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/if_urtwn.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/usb/if_zyd.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/usb/udsbr.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/uipaq.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/urio.c
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/usb/usscanner.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/aubtfwl.c
diff -u src/sys/dev/usb/aubtfwl.c:1.3 src/sys/dev/usb/aubtfwl.c:1.4
--- src/sys/dev/usb/aubtfwl.c:1.3 Fri Dec 23 00:51:43 2011
+++ src/sys/dev/usb/aubtfwl.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: aubtfwl.c,v 1.3 2011/12/23 00:51:43 jakllsch Exp $ */
+/* $NetBSD: aubtfwl.c,v 1.4 2012/12/27 16:42:32 skrll Exp $ */
/*
* Copyright (c) 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aubtfwl.c,v 1.3 2011/12/23 00:51:43 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aubtfwl.c,v 1.4 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
#include <dev/usb/usb.h>
@@ -110,7 +110,8 @@ aubtfwl_attach_hook(device_t self)
error = usbd_set_config_no(sc->sc_udev, 1, 0);
if (error != 0) {
- aprint_error_dev(self, "could not set configuration no\n");
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(error));
goto out_firmware;
}
Index: src/sys/dev/usb/emdtv.c
diff -u src/sys/dev/usb/emdtv.c:1.8 src/sys/dev/usb/emdtv.c:1.9
--- src/sys/dev/usb/emdtv.c:1.8 Sun Mar 11 01:06:06 2012
+++ src/sys/dev/usb/emdtv.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv.c,v 1.8 2012/03/11 01:06:06 mrg Exp $ */
+/* $NetBSD: emdtv.c,v 1.9 2012/12/27 16:42:32 skrll Exp $ */
/*-
* Copyright (c) 2008, 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.8 2012/03/11 01:06:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.9 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -128,7 +128,8 @@ emdtv_attach(device_t parent, device_t s
status = usbd_set_config_no(sc->sc_udev, 1, 1);
if (status != USBD_NORMAL_COMPLETION) {
- aprint_error_dev(sc->sc_dev, "couldn't set config no\n");
+ aprint_error_dev(sc->sc_dev, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(status));
return;
}
Index: src/sys/dev/usb/uberry.c
diff -u src/sys/dev/usb/uberry.c:1.8 src/sys/dev/usb/uberry.c:1.9
--- src/sys/dev/usb/uberry.c:1.8 Fri Dec 23 00:51:44 2011
+++ src/sys/dev/usb/uberry.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uberry.c,v 1.8 2011/12/23 00:51:44 jakllsch Exp $ */
+/* $NetBSD: uberry.c,v 1.9 2012/12/27 16:42:32 skrll Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.8 2011/12/23 00:51:44 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.9 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -127,7 +127,8 @@ uberry_charge(struct uberry_softc *sc)
err = usbd_set_config_no(sc->sc_udev, UBERRY_CONFIG_NO, 1);
if (err) {
- aprint_error_dev(sc->sc_dev, "setting config no failed\n");
+ aprint_error_dev(sc->sc_dev, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
return;
}
}
@@ -145,7 +146,8 @@ uberry_dual_mode(struct uberry_softc *sc
err = usbd_set_config_no(sc->sc_udev, UBERRY_CONFIG_NO, 1);
if (err) {
- aprint_error_dev(sc->sc_dev, "setting config no failed\n");
+ aprint_error_dev(sc->sc_dev, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
return;
}
}
Index: src/sys/dev/usb/if_atu.c
diff -u src/sys/dev/usb/if_atu.c:1.44 src/sys/dev/usb/if_atu.c:1.45
--- src/sys/dev/usb/if_atu.c:1.44 Sun Sep 23 01:08:17 2012
+++ src/sys/dev/usb/if_atu.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atu.c,v 1.44 2012/09/23 01:08:17 chs Exp $ */
+/* $NetBSD: if_atu.c,v 1.45 2012/12/27 16:42:32 skrll Exp $ */
/* $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
/*
* Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.44 2012/09/23 01:08:17 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.45 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
@@ -1257,7 +1257,8 @@ atu_attach(device_t parent, device_t sel
err = usbd_set_config_no(dev, ATU_CONFIG_NO, 1);
if (err) {
- aprint_error_dev(self, "setting config no failed\n");
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
return;
}
Index: src/sys/dev/usb/if_url.c
diff -u src/sys/dev/usb/if_url.c:1.44 src/sys/dev/usb/if_url.c:1.45
--- src/sys/dev/usb/if_url.c:1.44 Sun Jul 22 14:33:06 2012
+++ src/sys/dev/usb/if_url.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_url.c,v 1.44 2012/07/22 14:33:06 matt Exp $ */
+/* $NetBSD: if_url.c,v 1.45 2012/12/27 16:42:32 skrll Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.44 2012/07/22 14:33:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.45 2012/12/27 16:42:32 skrll Exp $");
#include "opt_inet.h"
@@ -202,7 +202,8 @@ url_attach(device_t parent, device_t sel
/* Move the device into the configured state. */
err = usbd_set_config_no(dev, URL_CONFIG_NO, 1);
if (err) {
- aprint_error_dev(self, "setting config no failed\n");
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
goto bad;
}
Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.127 src/sys/dev/usb/if_aue.c:1.128
--- src/sys/dev/usb/if_aue.c:1.127 Sun Jul 22 14:33:05 2012
+++ src/sys/dev/usb/if_aue.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.127 2012/07/22 14:33:05 matt Exp $ */
+/* $NetBSD: if_aue.c,v 1.128 2012/12/27 16:42:32 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.127 2012/07/22 14:33:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.128 2012/12/27 16:42:32 skrll Exp $");
#include "opt_inet.h"
@@ -745,7 +745,8 @@ aue_attach(device_t parent, device_t sel
err = usbd_set_config_no(dev, AUE_CONFIG_NO, 1);
if (err) {
- aprint_error_dev(self, "setting config no failed\n");
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
return;
}
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.60 src/sys/dev/usb/if_axe.c:1.61
--- src/sys/dev/usb/if_axe.c:1.60 Mon Nov 26 21:15:34 2012
+++ src/sys/dev/usb/if_axe.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.60 2012/11/26 21:15:34 christos Exp $ */
+/* $NetBSD: if_axe.c,v 1.61 2012/12/27 16:42:32 skrll Exp $ */
/* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
/*
@@ -89,7 +89,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.60 2012/11/26 21:15:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.61 2012/12/27 16:42:32 skrll Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -603,7 +603,8 @@ axe_attach(device_t parent, device_t sel
err = usbd_set_config_no(dev, AXE_CONFIG_NO, 1);
if (err) {
- aprint_error_dev(self, "getting interface handle failed\n");
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
return;
}
Index: src/sys/dev/usb/if_cue.c
diff -u src/sys/dev/usb/if_cue.c:1.63 src/sys/dev/usb/if_cue.c:1.64
--- src/sys/dev/usb/if_cue.c:1.63 Sun Mar 11 01:06:06 2012
+++ src/sys/dev/usb/if_cue.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cue.c,v 1.63 2012/03/11 01:06:06 mrg Exp $ */
+/* $NetBSD: if_cue.c,v 1.64 2012/12/27 16:42:32 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
* Bill Paul <wp...@ee.columbia.edu>. All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.63 2012/03/11 01:06:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.64 2012/12/27 16:42:32 skrll Exp $");
#include "opt_inet.h"
@@ -477,7 +477,8 @@ cue_attach(device_t parent, device_t sel
err = usbd_set_config_no(dev, CUE_CONFIG_NO, 1);
if (err) {
- aprint_error_dev(self, "setting config no failed\n");
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
return;
}
Index: src/sys/dev/usb/if_kue.c
diff -u src/sys/dev/usb/if_kue.c:1.77 src/sys/dev/usb/if_kue.c:1.78
--- src/sys/dev/usb/if_kue.c:1.77 Sun Mar 11 01:06:06 2012
+++ src/sys/dev/usb/if_kue.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kue.c,v 1.77 2012/03/11 01:06:06 mrg Exp $ */
+/* $NetBSD: if_kue.c,v 1.78 2012/12/27 16:42:32 skrll Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.77 2012/03/11 01:06:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.78 2012/12/27 16:42:32 skrll Exp $");
#include "opt_inet.h"
@@ -417,7 +417,8 @@ kue_attach(device_t parent, device_t sel
err = usbd_set_config_no(dev, KUE_CONFIG_NO, 1);
if (err) {
- aprint_error_dev(self, " setting config no failed\n");
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
return;
}
Index: src/sys/dev/usb/if_otus.c
diff -u src/sys/dev/usb/if_otus.c:1.16 src/sys/dev/usb/if_otus.c:1.17
--- src/sys/dev/usb/if_otus.c:1.16 Thu Dec 27 14:47:27 2012
+++ src/sys/dev/usb/if_otus.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otus.c,v 1.16 2012/12/27 14:47:27 christos Exp $ */
+/* $NetBSD: if_otus.c,v 1.17 2012/12/27 16:42:32 skrll Exp $ */
/* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */
/*-
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.16 2012/12/27 14:47:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.17 2012/12/27 16:42:32 skrll Exp $");
/*-
* Driver for Atheros AR9001U chipset.
* http://www.atheros.com/pt/bulletins/AR9001USBBulletin.pdf
@@ -611,9 +611,10 @@ otus_attach(device_t parent, device_t se
sc->sc_amrr.amrr_min_success_threshold = 1;
sc->sc_amrr.amrr_max_success_threshold = 10;
- if (usbd_set_config_no(sc->sc_udev, 1, 0) != 0) {
- aprint_error_dev(sc->sc_dev,
- "could not set configuration no\n");
+ error = usbd_set_config_no(sc->sc_udev, 1, 0);
+ if (error != 0) {
+ aprint_error_dev(sc->sc_dev, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(error));
return;
}
Index: src/sys/dev/usb/if_rum.c
diff -u src/sys/dev/usb/if_rum.c:1.43 src/sys/dev/usb/if_rum.c:1.44
--- src/sys/dev/usb/if_rum.c:1.43 Sun Sep 23 01:08:17 2012
+++ src/sys/dev/usb/if_rum.c Thu Dec 27 16:42:32 2012
@@ -1,5 +1,5 @@
/* $OpenBSD: if_rum.c,v 1.40 2006/09/18 16:20:20 damien Exp $ */
-/* $NetBSD: if_rum.c,v 1.43 2012/09/23 01:08:17 chs Exp $ */
+/* $NetBSD: if_rum.c,v 1.44 2012/12/27 16:42:32 skrll Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergam...@free.fr>
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.43 2012/09/23 01:08:17 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rum.c,v 1.44 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
@@ -330,8 +330,10 @@ rum_attach(device_t parent, device_t sel
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
- if (usbd_set_config_no(sc->sc_udev, RT2573_CONFIG_NO, 0) != 0) {
- aprint_error_dev(self, "could not set configuration no\n");
+ error = usbd_set_config_no(sc->sc_udev, RT2573_CONFIG_NO, 0);
+ if (error != 0) {
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(error));
return;
}
Index: src/sys/dev/usb/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.4 src/sys/dev/usb/if_run.c:1.5
--- src/sys/dev/usb/if_run.c:1.4 Mon Aug 20 07:32:49 2012
+++ src/sys/dev/usb/if_run.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_run.c,v 1.4 2012/08/20 07:32:49 christos Exp $ */
+/* $NetBSD: if_run.c,v 1.5 2012/12/27 16:42:32 skrll Exp $ */
/* $OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $ */
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.4 2012/08/20 07:32:49 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.5 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -500,9 +500,10 @@ run_attach(device_t parent, device_t sel
aprint_normal_dev(sc->sc_dev, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
- if (usbd_set_config_no(sc->sc_udev, 1, 0) != 0) {
- aprint_error_dev(sc->sc_dev,
- "could not set configuration no\n");
+ error = usbd_set_config_no(sc->sc_udev, 1, 0);
+ if (error != 0) {
+ aprint_error_dev(sc->sc_dev, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(error));
return;
}
Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.38 src/sys/dev/usb/if_udav.c:1.39
--- src/sys/dev/usb/if_udav.c:1.38 Sun Jul 22 14:33:05 2012
+++ src/sys/dev/usb/if_udav.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_udav.c,v 1.38 2012/07/22 14:33:05 matt Exp $ */
+/* $NetBSD: if_udav.c,v 1.39 2012/12/27 16:42:32 skrll Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.38 2012/07/22 14:33:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.39 2012/12/27 16:42:32 skrll Exp $");
#include "opt_inet.h"
@@ -205,7 +205,8 @@ udav_attach(device_t parent, device_t se
/* Move the device into the configured state. */
err = usbd_set_config_no(dev, UDAV_CONFIG_NO, 1); /* idx 0 */
if (err) {
- aprint_error_dev(self, "setting config no failed\n");
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
goto bad;
}
Index: src/sys/dev/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.6 src/sys/dev/usb/if_upgt.c:1.7
--- src/sys/dev/usb/if_upgt.c:1.6 Sun Mar 11 01:06:06 2012
+++ src/sys/dev/usb/if_upgt.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgt.c,v 1.6 2012/03/11 01:06:06 mrg Exp $ */
+/* $NetBSD: if_upgt.c,v 1.7 2012/12/27 16:42:32 skrll Exp $ */
/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.6 2012/03/11 01:06:06 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.7 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -244,9 +244,10 @@ upgt_attach(device_t parent, device_t se
return;
/* set configuration number */
- if (usbd_set_config_no(sc->sc_udev, UPGT_CONFIG_NO, 0) != 0) {
- aprint_error_dev(sc->sc_dev,
- "could not set configuration no\n");
+ error = usbd_set_config_no(sc->sc_udev, UPGT_CONFIG_NO, 0);
+ if (error != 0) {
+ aprint_error_dev(sc->sc_dev, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(error));
return;
}
Index: src/sys/dev/usb/udl.c
diff -u src/sys/dev/usb/udl.c:1.6 src/sys/dev/usb/udl.c:1.7
--- src/sys/dev/usb/udl.c:1.6 Sun Nov 20 12:29:33 2011
+++ src/sys/dev/usb/udl.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: udl.c,v 1.6 2011/11/20 12:29:33 nonaka Exp $ */
+/* $NetBSD: udl.c,v 1.7 2012/12/27 16:42:32 skrll Exp $ */
/*-
* Copyright (c) 2009 FUKAUMI Naoki.
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.6 2011/11/20 12:29:33 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udl.c,v 1.7 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -361,8 +361,11 @@ udl_attach(device_t parent, device_t sel
* Set device configuration descriptor number.
*/
error = usbd_set_config_no(sc->sc_udev, 1, 0);
- if (error != USBD_NORMAL_COMPLETION)
+ if (error != USBD_NORMAL_COMPLETION) {
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(error));
return;
+ }
/*
* Create device handle to interface descriptor.
Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.42 src/sys/dev/usb/if_upl.c:1.43
--- src/sys/dev/usb/if_upl.c:1.42 Thu Feb 2 19:43:07 2012
+++ src/sys/dev/usb/if_upl.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.42 2012/02/02 19:43:07 tls Exp $ */
+/* $NetBSD: if_upl.c,v 1.43 2012/12/27 16:42:32 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.42 2012/02/02 19:43:07 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.43 2012/12/27 16:42:32 skrll Exp $");
#include "opt_inet.h"
@@ -239,7 +239,8 @@ upl_attach(device_t parent, device_t sel
err = usbd_set_config_no(dev, UPL_CONFIG_NO, 1);
if (err) {
- aprint_error_dev(self, "setting config no failed\n");
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
return;
}
Index: src/sys/dev/usb/if_ural.c
diff -u src/sys/dev/usb/if_ural.c:1.40 src/sys/dev/usb/if_ural.c:1.41
--- src/sys/dev/usb/if_ural.c:1.40 Thu May 31 12:32:35 2012
+++ src/sys/dev/usb/if_ural.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ural.c,v 1.40 2012/05/31 12:32:35 nonaka Exp $ */
+/* $NetBSD: if_ural.c,v 1.41 2012/12/27 16:42:32 skrll Exp $ */
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $ */
/*-
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.40 2012/05/31 12:32:35 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.41 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
@@ -388,8 +388,10 @@ ural_attach(device_t parent, device_t se
aprint_normal_dev(self, "%s\n", devinfop);
usbd_devinfo_free(devinfop);
- if (usbd_set_config_no(sc->sc_udev, RAL_CONFIG_NO, 0) != 0) {
- aprint_error_dev(self, "could not set configuration no\n");
+ error = usbd_set_config_no(sc->sc_udev, RAL_CONFIG_NO, 0);
+ if (error != 0) {
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(error));
return;
}
Index: src/sys/dev/usb/if_urtw.c
diff -u src/sys/dev/usb/if_urtw.c:1.1 src/sys/dev/usb/if_urtw.c:1.2
--- src/sys/dev/usb/if_urtw.c:1.1 Tue May 29 14:06:23 2012
+++ src/sys/dev/usb/if_urtw.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtw.c,v 1.1 2012/05/29 14:06:23 christos Exp $ */
+/* $NetBSD: if_urtw.c,v 1.2 2012/12/27 16:42:32 skrll Exp $ */
/* $OpenBSD: if_urtw.c,v 1.39 2011/07/03 15:47:17 matthew Exp $ */
/*-
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.1 2012/05/29 14:06:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtw.c,v 1.2 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -2317,8 +2317,8 @@ urtw_init(struct ifnet *ifp)
if (!(sc->sc_flags & URTW_INIT_ONCE)) {
error = usbd_set_config_no(sc->sc_udev, URTW_CONFIG_NO, 0);
if (error != 0) {
- printf("%s: could not set configuration no\n",
- device_xname(sc->sc_dev));
+ aprint_error_dev(sc->sc_dev, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(error));
goto fail;
}
/* get the first interface handle */
@@ -3686,8 +3686,9 @@ urtw_8187b_init(struct ifnet *ifp)
if (!(sc->sc_flags & URTW_INIT_ONCE)) {
error = usbd_set_config_no(sc->sc_udev, URTW_CONFIG_NO, 0);
if (error != 0) {
- printf("%s: could not set configuration no\n",
- device_xname(sc->sc_dev));
+ aprint_error_dev(sc->sc_dev, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(error));
+
goto fail;
}
/* Get the first interface handle. */
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.5 src/sys/dev/usb/if_urtwn.c:1.6
--- src/sys/dev/usb/if_urtwn.c:1.5 Thu Jun 14 04:14:36 2012
+++ src/sys/dev/usb/if_urtwn.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.5 2012/06/14 04:14:36 riz Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.6 2012/12/27 16:42:32 skrll Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.5 2012/06/14 04:14:36 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.6 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -268,8 +268,10 @@ urtwn_attach(device_t parent, device_t s
callout_init(&sc->sc_calib_to, 0);
callout_setfunc(&sc->sc_calib_to, urtwn_calib_to, sc);
- if (usbd_set_config_no(sc->sc_udev, 1, 0) != 0) {
- aprint_error_dev(self, "could not set configuration no\n");
+ error = usbd_set_config_no(sc->sc_udev, 1, 0);
+ if (error != 0) {
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(error));
goto fail;
}
Index: src/sys/dev/usb/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.32 src/sys/dev/usb/if_zyd.c:1.33
--- src/sys/dev/usb/if_zyd.c:1.32 Sun Sep 23 14:40:29 2012
+++ src/sys/dev/usb/if_zyd.c Thu Dec 27 16:42:32 2012
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */
-/* $NetBSD: if_zyd.c,v 1.32 2012/09/23 14:40:29 joerg Exp $ */
+/* $NetBSD: if_zyd.c,v 1.33 2012/12/27 16:42:32 skrll Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergam...@free.fr>
@@ -22,7 +22,7 @@
* ZyDAS ZD1211/ZD1211B USB WLAN driver.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.32 2012/09/23 14:40:29 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.33 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
@@ -365,7 +365,8 @@ zyd_complete_attach(struct zyd_softc *sc
error = usbd_set_config_no(sc->sc_udev, ZYD_CONFIG_NO, 1);
if (error != 0) {
- aprint_error_dev(sc->sc_dev, "setting config no failed\n");
+ aprint_error_dev(sc->sc_dev, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(error));
goto fail;
}
Index: src/sys/dev/usb/udsbr.c
diff -u src/sys/dev/usb/udsbr.c:1.21 src/sys/dev/usb/udsbr.c:1.22
--- src/sys/dev/usb/udsbr.c:1.21 Sun Mar 11 01:06:07 2012
+++ src/sys/dev/usb/udsbr.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: udsbr.c,v 1.21 2012/03/11 01:06:07 mrg Exp $ */
+/* $NetBSD: udsbr.c,v 1.22 2012/12/27 16:42:32 skrll Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.21 2012/03/11 01:06:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udsbr.c,v 1.22 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -141,7 +141,8 @@ udsbr_attach(device_t parent, device_t s
err = usbd_set_config_no(dev, UDSBR_CONFIG_NO, 1);
if (err) {
- aprint_error_dev(self, "setting config no failed\n");
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
return;
}
Index: src/sys/dev/usb/uhso.c
diff -u src/sys/dev/usb/uhso.c:1.9 src/sys/dev/usb/uhso.c:1.10
--- src/sys/dev/usb/uhso.c:1.9 Thu Apr 5 16:31:53 2012
+++ src/sys/dev/usb/uhso.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uhso.c,v 1.9 2012/04/05 16:31:53 plunky Exp $ */
+/* $NetBSD: uhso.c,v 1.10 2012/12/27 16:42:32 skrll Exp $ */
/*-
* Copyright (c) 2009 Iain Hibbert
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.9 2012/04/05 16:31:53 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.10 2012/12/27 16:42:32 skrll Exp $");
#include "opt_inet.h"
@@ -478,9 +478,8 @@ uhso_attach(device_t parent, device_t se
status = usbd_set_config_no(sc->sc_udev, UHSO_CONFIG_NO, 1);
if (status != USBD_NORMAL_COMPLETION) {
- aprint_error_dev(self, "could not set config no %d: %s\n",
- UHSO_CONFIG_NO, usbd_errstr(status));
-
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(status));
return;
}
Index: src/sys/dev/usb/uipaq.c
diff -u src/sys/dev/usb/uipaq.c:1.18 src/sys/dev/usb/uipaq.c:1.19
--- src/sys/dev/usb/uipaq.c:1.18 Fri Dec 23 00:51:46 2011
+++ src/sys/dev/usb/uipaq.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uipaq.c,v 1.18 2011/12/23 00:51:46 jakllsch Exp $ */
+/* $NetBSD: uipaq.c,v 1.19 2012/12/27 16:42:32 skrll Exp $ */
/* $OpenBSD: uipaq.c,v 1.1 2005/06/17 23:50:33 deraadt Exp $ */
/*
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.18 2011/12/23 00:51:46 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipaq.c,v 1.19 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -177,8 +177,8 @@ uipaq_attach(device_t parent, device_t s
/* Move the device into the configured state. */
err = usbd_set_config_no(dev, UIPAQ_CONFIG_NO, 1);
if (err) {
- aprint_error("\n%s: failed to set configuration, err=%s\n",
- devname, usbd_errstr(err));
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
goto bad;
}
Index: src/sys/dev/usb/urio.c
diff -u src/sys/dev/usb/urio.c:1.39 src/sys/dev/usb/urio.c:1.40
--- src/sys/dev/usb/urio.c:1.39 Tue Mar 6 03:35:30 2012
+++ src/sys/dev/usb/urio.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: urio.c,v 1.39 2012/03/06 03:35:30 mrg Exp $ */
+/* $NetBSD: urio.c,v 1.40 2012/12/27 16:42:32 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.39 2012/03/06 03:35:30 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.40 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -156,7 +156,8 @@ urio_attach(device_t parent, device_t se
err = usbd_set_config_no(dev, URIO_CONFIG_NO, 1);
if (err) {
- aprint_error_dev(self, "setting config no failed\n");
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
return;
}
Index: src/sys/dev/usb/uscanner.c
diff -u src/sys/dev/usb/uscanner.c:1.72 src/sys/dev/usb/uscanner.c:1.73
--- src/sys/dev/usb/uscanner.c:1.72 Tue Mar 6 03:35:30 2012
+++ src/sys/dev/usb/uscanner.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.72 2012/03/06 03:35:30 mrg Exp $ */
+/* $NetBSD: uscanner.c,v 1.73 2012/12/27 16:42:32 skrll Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.72 2012/03/06 03:35:30 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.73 2012/12/27 16:42:32 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -294,7 +294,8 @@ uscanner_attach(device_t parent, device_
err = usbd_set_config_no(uaa->device, 1, 1); /* XXX */
if (err) {
- aprint_error_dev(self, "setting config no failed\n");
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
sc->sc_dying = 1;
return;
}
Index: src/sys/dev/usb/usscanner.c
diff -u src/sys/dev/usb/usscanner.c:1.35 src/sys/dev/usb/usscanner.c:1.36
--- src/sys/dev/usb/usscanner.c:1.35 Tue Mar 6 03:35:30 2012
+++ src/sys/dev/usb/usscanner.c Thu Dec 27 16:42:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usscanner.c,v 1.35 2012/03/06 03:35:30 mrg Exp $ */
+/* $NetBSD: usscanner.c,v 1.36 2012/12/27 16:42:32 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.35 2012/03/06 03:35:30 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.36 2012/12/27 16:42:32 skrll Exp $");
#include "scsibus.h"
#include <sys/param.h>
@@ -196,7 +196,8 @@ usscanner_attach(device_t parent, device
err = usbd_set_config_no(dev, USSCANNER_CONFIG_NO, 1);
if (err) {
- aprint_error_dev(self, "setting config no failed\n");
+ aprint_error_dev(self, "failed to set configuration"
+ ", err=%s\n", usbd_errstr(err));
return;
}
