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

Next file: linux/drivers/usb/usb.c
Previous file: linux/drivers/usb/ezusb.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.27/linux/drivers/usb/printer.c linux/drivers/usb/printer.c
@@ -165,7 +165,7 @@
 	unsigned long partial;
 	int result = USB_ST_NOERROR;
 	int maxretry;
-	
+
 	do {
 		char *obuf = p->obuf;
 		unsigned long thistime;
@@ -180,7 +180,7 @@
 			if (signal_pending(current)) {
 				return bytes_written ? bytes_written : -EINTR;
 			}
-			result = p->pusb_dev->bus->op->bulk_msg(p->pusb_dev,
+			result = usb_bulk_msg(p->pusb_dev,
 					 usb_sndbulkpipe(p->pusb_dev, p->bulk_out_ep),
 					 obuf, thistime, &partial, HZ*20);
 			if (partial) {
@@ -233,7 +233,7 @@
 			return -ENODEV;
 		this_read = (count > sizeof(buf)) ? sizeof(buf) : count;
 
-		result = p->pusb_dev->bus->op->bulk_msg(p->pusb_dev,
+		result = usb_bulk_msg(p->pusb_dev,
 			  usb_rcvbulkpipe(p->pusb_dev, p->bulk_in_ep),
 			  buf, this_read, &partial, HZ*20);
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)