From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Fri, 18 May 2012 03:28:51 +0000 (+0000)
Subject: Fix libusb-based USB backend on non-Linux platforms (STR #4088)
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0599b43f8111b97d6e5f281c7630f3346286de39;p=thirdparty%2Fcups.git

Fix libusb-based USB backend on non-Linux platforms (STR #4088)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10473 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/CHANGES-1.5.txt b/CHANGES-1.5.txt
index 0580958c40..829ae2119a 100644
--- a/CHANGES-1.5.txt
+++ b/CHANGES-1.5.txt
@@ -1,6 +1,12 @@
 CHANGES-1.5.txt
 ---------------
 
+CHANGES IN CUPS V1.5.4
+
+	- The libusb-based USB backend did not work on non-Linux platforms
+	  (STR #4088)
+
+
 CHANGES IN CUPS V1.5.3
 
 	- httpReconnect() did not reset the read/write buffers (STR #4065)
diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
index d1517dc055..7a1e7f4ca1 100644
--- a/backend/usb-libusb.c
+++ b/backend/usb-libusb.c
@@ -1148,9 +1148,14 @@ open_device(usb_printer_t *printer,	/* I - Printer */
   else
   {
     printer->usblp_attached = 0;
-    fprintf(stderr, "DEBUG: Failed to check whether %04x:%04x has the \"usblp\" kernel module attached\n",
-	      devdesc.idVendor, devdesc.idProduct);
-    goto error;
+
+    if (errcode != LIBUSB_ERROR_NOT_SUPPORTED)
+    {
+      fprintf(stderr,
+              "DEBUG: Failed to check whether %04x:%04x has the \"usblp\" "
+              "kernel module attached\n", devdesc.idVendor, devdesc.idProduct);
+      goto error;
+    }
   }
 
  /*