summary refs log tree commit diff
path: root/drivers/usb/class
diff options
context:
space:
mode:
authorPete Zaitcev <zaitcev@redhat.com>2007-05-24 21:59:19 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-06-08 16:24:29 -0700
commit97cb95d1c4b724bc3bedd16dd022fbd3c2d61283 (patch)
tree8ae7b01a99055e928cc30fac36437b3f3517d089 /drivers/usb/class
parentdda034bcb51a0a28318046d74d664e0fc5f7d1d4 (diff)
downloadlinux-97cb95d1c4b724bc3bedd16dd022fbd3c2d61283.tar.gz
usblp: Don't let suspend to kill ->used
Suspend destroys refcounting for open/release.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Diffstat (limited to 'drivers/usb/class')
-rw-r--r--drivers/usb/class/usblp.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 7b1edfe46b28..6778f9af7943 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -347,10 +347,8 @@ static int handle_bidir (struct usblp *usblp)
 	if (usblp->bidir && usblp->used && !usblp->sleeping) {
 		usblp->readcount = 0;
 		usblp->readurb->dev = usblp->dev;
-		if (usb_submit_urb(usblp->readurb, GFP_KERNEL) < 0) {
-			usblp->used = 0;
+		if (usb_submit_urb(usblp->readurb, GFP_KERNEL) < 0)
 			return -EIO;
-		}
 	}
 
 	return 0;
@@ -412,6 +410,7 @@ static int usblp_open(struct inode *inode, struct file *file)
 	usblp->readurb->status = 0;
 
 	if (handle_bidir(usblp) < 0) {
+		usblp->used = 0;
 		file->private_data = NULL;
 		retval = -EIO;
 	}