patch-2.3.10 linux/drivers/usb/printer.c

• Lines: 29
• Date: Thu Jul 8 15:19:55 1999
• Orig file: v2.3.9/linux/drivers/usb/printer.c
• Orig date: Wed Jun 30 13:38:20 1999

diff -u --recursive --new-file v2.3.9/linux/drivers/usb/printer.c linux/drivers/usb/printer.c
@@ -124,6 +124,7 @@
 		return -EBUSY;
 	}
 	if (!(p->obuf = (char *)__get_free_page(GFP_KERNEL))) {
+		p->isopen = 0;
 		return -ENOMEM;
 	}
 
@@ -166,7 +167,6 @@
 	do {
 		char *obuf = p->obuf;
 		unsigned long thistime;
-		partial = 0;
 
 		thistime = copy_size = (count > p->maxout) ? p->maxout : count;
 		if (copy_from_user(p->obuf, buffer, copy_size))
@@ -303,7 +303,11 @@
 	minor_data[i] = PPDATA(dev->private);
 	minor_data[i]->minor = i;
 	minor_data[i]->pusb_dev = dev;
-	minor_data[i]->maxout = interface->endpoint[0].wMaxPacketSize * 16;
+	/* The max packet size can't be more than 64 (& will be 64 for
+	 * any decent bulk device); this calculation was silly.  -greg
+	 * minor_data[i]->maxout = interface->endpoint[0].wMaxPacketSize * 16;
+	 */
+	minor_data[i]->maxout = 8192;
 	if (minor_data[i]->maxout > PAGE_SIZE) {
                 minor_data[i]->maxout = PAGE_SIZE;
 	}