patch-2.3.43 linux/drivers/usb/devio.c

• Lines: 73
• Date: Wed Feb 9 11:42:35 2000
• Orig file: v2.3.42/linux/drivers/usb/devio.c
• Orig date: Fri Jan 21 18:19:17 2000

diff -u --recursive --new-file v2.3.42/linux/drivers/usb/devio.c linux/drivers/usb/devio.c
@@ -19,7 +19,7 @@
  *      along with this program; if not, write to the Free Software
  *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- *  $Id: devio.c,v 1.6 2000/01/11 23:26:33 tom Exp $
+ *  $Id: devio.c,v 1.7 2000/02/01 17:28:48 fliegl Exp $
  *
  *  This file implements the usbdevfs/x/y files, where
  *  x is the bus number and y the device number.
@@ -132,8 +132,8 @@
         urb->transfer_buffer = data;
         urb->transfer_buffer_length = size;
 	ret = do_sync(urb, timeout);
-	if (ret >= 0)
-		ret = urb->status;
+	//if (ret >= 0)
+	//	ret = urb->status;
 	if (ret >= 0)
 		ret = urb->actual_length;
 	kfree(urb->setup_packet);
@@ -154,8 +154,8 @@
         urb->transfer_buffer = data;
         urb->transfer_buffer_length = len;
 	ret = do_sync(urb, timeout);
-	if (ret >= 0)
-		ret = urb->status;
+	//if (ret >= 0)
+	//	ret = urb->status;
 	if (ret >= 0 && actual_length != NULL)
 		*actual_length = urb->actual_length;
 	usb_free_urb(urb);
@@ -321,7 +321,7 @@
         struct dev_state *ps = as->ps;
 	struct siginfo sinfo;
 
-#if 0
+#if 1
 	printk(KERN_DEBUG "usbdevfs: async_completed: status %d errcount %d actlen %d pipe 0x%x\n", 
 	       urb->status, urb->error_count, urb->actual_length, urb->pipe);
 #endif
@@ -345,7 +345,7 @@
         unsigned long flags;
 
         spin_lock_irqsave(&ps->lock, flags);
-        if (!list_empty(&ps->async_pending)) {
+        while (!list_empty(&ps->async_pending)) {
                 as = list_entry(ps->async_pending.next, struct async, asynclist);
                 list_del(&as->asynclist);
                 INIT_LIST_HEAD(&as->asynclist);
@@ -1003,17 +1003,12 @@
 }
 
 static struct file_operations usbdevfs_device_file_operations = {
-	usbdev_lseek,    /* lseek   */
-	usbdev_read,     /* read    */
-	NULL,            /* write   */
-	NULL,            /* readdir */
-	usbdev_poll,     /* poll    */
-	usbdev_ioctl,    /* ioctl   */
-	NULL,            /* mmap    */
-	usbdev_open,     /* open    */
-	NULL,            /* flush   */
-	usbdev_release,  /* release */
-	NULL             /* fsync   */
+	llseek:		usbdev_lseek,
+	read:		usbdev_read,
+	poll:		usbdev_poll,
+	ioctl:		usbdev_ioctl,
+	open:		usbdev_open,
+	release:	usbdev_release,
 };
 
 struct inode_operations usbdevfs_device_inode_operations = {