patch-2.4.0-test3 linux/drivers/usb/printer.c

• Lines: 31
• Date: Thu Jul 6 19:38:22 2000
• Orig file: v2.4.0-test2/linux/drivers/usb/printer.c
• Orig date: Fri Jun 23 21:55:10 2000

diff -u --recursive --new-file v2.4.0-test2/linux/drivers/usb/printer.c linux/drivers/usb/printer.c
@@ -42,7 +42,7 @@
 #include <linux/init.h>
 #include <linux/malloc.h>
 #include <linux/lp.h>
-#define DEBUG
+#undef DEBUG
 #include <linux/usb.h>
 
 #define USBLP_BUF_SIZE		8192
@@ -70,7 +70,7 @@
 #define USBLP_MINORS		16
 #define USBLP_MINOR_BASE	0
 
-#define USBLP_WRITE_TIMEOUT	(60*HZ)			/* 60 seconds */
+#define USBLP_WRITE_TIMEOUT	(60*60*HZ)		/* 60 minutes */
 
 struct usblp {
 	struct usb_device 	*dev;			/* USB device */
@@ -147,10 +147,8 @@
 			info("usblp%d: off-line", usblp->minor);
 			return -EIO;
 		}
-		if (~status & LP_PERRORP) {
-			info("usblp%d: on fire", usblp->minor);
-			return -EIO;
-		}
+		info("usblp%d: on fire", usblp->minor);
+		return -EIO;
 	}
 
 	return 0;