Merge with rsync://fileserver/linux

Update to 2.6.12-rc3

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index bba22e97ea0f..7ce43fb8118a 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -379,6 +379,8 @@ static int usblp_open(struct inode *inode, struct file *file)
         usblp->writeurb->transfer_buffer_length = 0;
         usblp->wcomplete = 1; /* we begin writeable */
         usblp->rcomplete = 0;
+        usblp->writeurb->status = 0;
+        usblp->readurb->status = 0;
 
         if (usblp->bidir) {
                 usblp->readcount = 0;
@@ -751,6 +753,7 @@ static ssize_t usblp_read(struct file *file, char __user *buffer, size_t count,
                                 schedule();
                         } else {
                                 set_current_state(TASK_RUNNING);
+                                down(&usblp->sem);
                                 break;
                         }
                         down (&usblp->sem);