Commit 0b074f69 authored Sep 19, 2019 by Johan Hovold Committed by Greg Kroah-Hartman Oct 04, 2019

USB: legousbtower: fix open after failed reset request



The driver would return with a nonzero open count in case the reset
control request failed. This would prevent any further attempts to open
the char dev until the device was disconnected.

Fix this by incrementing the open count only on successful open.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: Johan Hovold <johan@kernel.org>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20190919083039.30898-5-johan@kernel.org


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent cd81e6fa

drivers/usb/misc/legousbtower.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -348,7 +348,6 @@ static int tower_open (struct inode inode, struct file file)
		retval = -EBUSY;
		goto unlock_exit;
		}
		dev->open_count = 1;

		/* reset the tower */
		result = usb_control_msg (dev->udev,
		@@ -388,13 +387,14 @@ static int tower_open (struct inode inode, struct file file)
		dev_err(&dev->udev->dev,
		"Couldn't submit interrupt_in_urb %d\n", retval);
		dev->interrupt_in_running = 0;
		dev->open_count = 0;
		goto unlock_exit;
		}

		/* save device in the file's private structure */
		file->private_data = dev;

		dev->open_count = 1;

		unlock_exit:
		mutex_unlock(&dev->lock);

Admin message