From 48cbc7d2d94d43dc408f631baac40dac35f4eb67 Mon Sep 17 00:00:00 2001
From: marschap <marschap@users.sourceforge.net>
Date: Mon, 22 Sep 2008 19:24:12 +0000
Subject: [PATCH] don't let init fail if usb_set_configuration() fails; be more
 verbose in USB init

---
 server/drivers/IOWarrior.c        | 17 ++++++++++++-----
 server/drivers/hd44780-bwct-usb.c | 17 +++++++++++++++--
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/server/drivers/IOWarrior.c b/server/drivers/IOWarrior.c
index 72da4a9..1d04f80 100644
--- a/server/drivers/IOWarrior.c
+++ b/server/drivers/IOWarrior.c
@@ -376,23 +376,30 @@ PrivateData *p;
   if (p->udh != NULL) {
     debug(RPT_DEBUG, "%s: opening device succeeded", drvthis->name);
 
+    errno = 0;
     if (usb_set_configuration(p->udh, 1) < 0) {
-      usb_close(p->udh);
-      report(RPT_ERR, "%s: unable to set configuration", drvthis->name);
-      return -1;
+      report(RPT_WARNING, "%s: unable to set configuration: %s",
+             drvthis->name, strerror(errno));
     }
 
+    errno = 0;
     if (usb_claim_interface(p->udh, 1) < 0) {
 #if defined(LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
+      report(RPT_WARNING, "%s: interface may be claimed by kernel driver, attempting to detach it",
+             drvthis->name);
+      
+      errno = 0;
       if ((usb_detach_kernel_driver_np(p->udh, 1) < 0) ||
           (usb_claim_interface(p->udh, 1) < 0)) {
+        report(RPT_ERR, "%s: unable to re-claim interface: %s",
+	       drvthis->name, strerror(errno));
         usb_close(p->udh);
-        report(RPT_ERR, "%s: unable to re-claim interface", drvthis->name);
         return -1;
       }
 #else
+      report(RPT_ERR, "%s: unable to claim interface: %s",
+             drvthis->name, strerror(errno));
       usb_close(p->udh);
-      report(RPT_ERR, "%s: unable to claim interface", drvthis->name);
       return -1;
 #endif
     }
diff --git a/server/drivers/hd44780-bwct-usb.c b/server/drivers/hd44780-bwct-usb.c
index 3c5652d..dbb114e 100644
--- a/server/drivers/hd44780-bwct-usb.c
+++ b/server/drivers/hd44780-bwct-usb.c
@@ -148,17 +148,30 @@ hd_init_bwct_usb(Driver *drvthis)
   if (p->usbHandle != NULL) {
     debug(RPT_DEBUG, "hd_init_bwct_usb: opening device succeeded");
 
+    errno = 0;
+    if (usb_set_configuration(p->usbHandle, p->usbIndex) < 0) {
+      report(RPT_WARNING, "hd_init_bwct_usb: unable to set configuration: %s",
+             strerror(errno));
+    }
+
+    errno = 0;
     if (usb_claim_interface(p->usbHandle, p->usbIndex) < 0) {
 #if defined(LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
+      report(RPT_WARNING, "hd_init_bwct_usb: interface may be claimed by "
+                          "kernel driver, attempting to detach it");
+      
+      errno = 0;
       if ((usb_detach_kernel_driver_np(p->usbHandle, p->usbIndex) < 0) ||
           (usb_claim_interface(p->usbHandle, p->usbIndex) < 0)) {
+        report(RPT_ERR, "hd_init_bwct_usb: unable to re-claim interface: %s",
+	       strerror(errno));
         usb_close(p->usbHandle);
-        report(RPT_ERR, "hd_init_bwct_usb: unable to re-claim interface");
         return -1;
       }
 #else
+      report(RPT_ERR, "hd_init_bwct_usb: unable to claim interface: %s",
+             strerror(errno));
       usb_close(p->usbHandle);
-      report(RPT_ERR, "hd_init_bwct_usb: unable to claim interface");
       return -1;
 #endif
     }