patch-2.3.29 linux/drivers/usb/hp_scanner.c

Next file: linux/drivers/usb/proc_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.28/linux/drivers/usb/hp_scanner.c linux/drivers/usb/hp_scanner.c
@@ -128,7 +128,7 @@
 				return bytes_written ? bytes_written : -EINTR;
 			}
 
-			result = hps->hpscan_dev->bus->op->bulk_msg(hps->hpscan_dev,usb_sndbulkpipe(hps->hpscan_dev, 2), obuf, thistime, &partial, HZ*10);
+			result = usb_bulk_msg(hps->hpscan_dev,usb_sndbulkpipe(hps->hpscan_dev, 2), obuf, thistime, &partial, HZ*10);
 			
 			//printk(KERN_DEBUG "write stats: result:%d thistime:%lu partial:%lu\n", result, thistime, partial);
 
@@ -186,7 +186,7 @@
 			return -ENODEV;
 		this_read = (count > IBUF_SIZE) ? IBUF_SIZE : count;
 		
-		result = hps->hpscan_dev->bus->op->bulk_msg(hps->hpscan_dev, usb_rcvbulkpipe(hps->hpscan_dev, 1), ibuf, this_read, &partial, HZ*10);
+		result = usb_bulk_msg(hps->hpscan_dev, usb_rcvbulkpipe(hps->hpscan_dev, 1), ibuf, this_read, &partial, HZ*10);
 
 		printk(KERN_DEBUG "read stats: result:%d this_read:%u partial:%lu\n", result, this_read, partial);
 		

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