0727714
diff -up cups-1.5.4/backend/usb-libusb.c.usblp-quirks cups-1.5.4/backend/usb-libusb.c
0727714
--- cups-1.5.4/backend/usb-libusb.c.usblp-quirks	2012-07-16 19:16:46.000000000 +0200
aa4234a
+++ cups-1.5.4/backend/usb-libusb.c	2012-10-17 16:30:58.571793169 +0200
0727714
@@ -70,7 +70,7 @@ typedef struct usb_printer_s		/**** USB
0727714
 			read_endp,	/* Read endpoint */
0727714
 			protocol,	/* Protocol: 1 = Uni-di, 2 = Bi-di. */
0727714
 			usblp_attached,	/* "usblp" kernel module attached? */
0727714
-			opened_for_job;	/* Set to 1 by print_device() */
0727714
+			reset_after_job; /* Set to 1 by print_device() */
0727714
   unsigned int		quirks;		/* Quirks flags */
0727714
   struct libusb_device_handle *handle;	/* Open handle to device */
0727714
 } usb_printer_t;
0727714
@@ -122,6 +122,8 @@ struct quirk_printer_struct {
0727714
 #define USBLP_QUIRK_USB_INIT	0x2	/* needs vendor USB init string */
0727714
 #define USBLP_QUIRK_BAD_CLASS	0x4	/* descriptor uses vendor-specific
0727714
 					   Class or SubClass */
0727714
+#define USBLP_QUIRK_RESET	0x4000	/* After printing do a reset
0727714
+					   for clean-up */
0727714
 #define USBLP_QUIRK_NO_REATTACH	0x8000	/* After printing we cannot re-attach
0727714
 					   the usblp kernel module */
0727714
 
d4c40d4
@@ -141,15 +143,45 @@ static const struct quirk_printer_struct
0727714
 	{ 0x0409, 0xf1be, USBLP_QUIRK_BIDIR }, /* NEC Picty800 (HP OEM) */
0727714
 	{ 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820,
0727714
 						  by zut <kernel@zut.de> */
0727714
+	{ 0x04a9, 0x10a2, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4200
0727714
+			    Printer, http://www.cups.org/str.php?L4155 */
0727714
+	{ 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300
0727714
+			    Printer, https://bugs.launchpad.net/bugs/1032385 */
d4c40d4
+	{ 0x04a9, 0x1721, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP210
d4c40d4
+		      https://bugzilla.redhat.com/show_bug.cgi?id=847923#c53 */
aa4234a
+	{ 0x04a9, 0x170c, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP500
aa4234a
+			    Printer, https://bugs.launchpad.net/bugs/1032456 */
aa4234a
+	{ 0x04a9, 0x1717, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP510
aa4234a
+			    Printer, https://bugs.launchpad.net/bugs/1050009 */
aa4234a
+	{ 0x04a9, 0x173d, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP550
aa4234a
+			    Printer, http://www.cups.org/str.php?L4155 */
aa4234a
+	{ 0x04a9, 0x173e, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP560
aa4234a
+			    Printer, http://www.cups.org/str.php?L4155 */
aa4234a
+	{ 0x04f9, 0x001a, USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
aa4234a
+						  HL-1430 Laser Printer,
aa4234a
+				     https://bugs.launchpad.net/bugs/1038695 */
0727714
 	{ 0x04f9, 0x000d, USBLP_QUIRK_BIDIR |
0727714
 			  USBLP_QUIRK_NO_REATTACH }, /* Brother Industries, Ltd
aa4234a
-						  HL-1440 Laser Printer */
aa4234a
+						  HL-1440 Laser Printer,
aa4234a
+				     https://bugs.launchpad.net/bugs/1000253 */
aa4234a
+	{ 0x06bc, 0x000b, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp.
aa4234a
+						  Okipage 14ex Printer,
aa4234a
+				     https://bugs.launchpad.net/bugs/872483 */
aa4234a
+	{ 0x06bc, 0x01c7, USBLP_QUIRK_NO_REATTACH }, /* Oki Data Corp. B410d,
aa4234a
+				     https://bugs.launchpad.net/bugs/872483 */
0727714
 	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
0727714
 						      Printer M129C */
0727714
 	{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
0727714
-			  USBLP_QUIRK_NO_REATTACH },
0727714
+			  USBLP_QUIRK_NO_REATTACH |
0727714
+	                  USBLP_QUIRK_RESET },
aa4234a
+	{ 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124
aa4234a
+			  https://bugzilla.redhat.com/show_bug.cgi?id=867392 */
0727714
 	/* Prolific Technology, Inc. PL2305 Parallel Port
aa4234a
-	   (USB -> Parallel adapter) */
aa4234a
+	   (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
aa4234a
+	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices,
aa4234a
+				     https://bugs.launchpad.net/bugs/1032456 */
aa4234a
+	{ 0x0a5f, 0x0000, USBLP_QUIRK_BIDIR }, /* All Zebra devices,
aa4234a
+				     https://bugs.launchpad.net/bugs/1001028 */
0727714
 	{ 0, 0 }
0727714
 };
0727714
 
aa4234a
@@ -256,7 +286,12 @@ print_device(const char *uri,		/* I - De
0727714
   }
0727714
 
0727714
   g.print_fd = print_fd;
0727714
-  g.printer->opened_for_job = 1;
0727714
+
0727714
+ /*
0727714
+  * Some devices need a reset after finishing a job, these devices are
0727714
+  * marked with the USBLP_QUIRK_RESET quirk.
0727714
+  */
0727714
+  g.printer->reset_after_job = (g.printer->quirks & USBLP_QUIRK_RESET ? 1 : 0);
0727714
 
0727714
  /*
0727714
   * If we are printing data from a print driver on stdin, ignore SIGTERM
aa4234a
@@ -772,7 +807,7 @@ close_device(usb_printer_t *printer)	/*
0727714
     * Reset the device to clean up after the job
0727714
     */
0727714
 
0727714
-    if (printer->opened_for_job == 1)
0727714
+    if (printer->reset_after_job == 1)
0727714
     {
0727714
       if ((errcode = libusb_reset_device(printer->handle)) < 0)
0727714
 	fprintf(stderr,
aa4234a
@@ -1288,7 +1323,7 @@ open_device(usb_printer_t *printer,	/* I
0727714
   }
0727714
 
0727714
   printer->usblp_attached = 0;
0727714
-  printer->opened_for_job = 0;
0727714
+  printer->reset_after_job = 0;
0727714
 
0727714
   if (verbose)
0727714
     fputs("STATE: +connecting-to-device\n", stderr);
aa4234a
@@ -1586,7 +1621,8 @@ static unsigned int quirks(int vendor, i
0727714
   for (i = 0; quirk_printers[i].vendorId; i++)
0727714
   {
0727714
     if (vendor == quirk_printers[i].vendorId &&
0727714
-	product == quirk_printers[i].productId)
0727714
+	(quirk_printers[i].productId == 0x0000 ||
0727714
+	 product == quirk_printers[i].productId))
0727714
       return quirk_printers[i].quirks;
0727714
   }
0727714
   return 0;