lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: cleanup ofd adutux

Browse Source 
this driver does
- ignore errors during open
- submit a running urb
- use down_interruptible not handling signals
- GFP_KERNEL with a spinlock held

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Oliver Neukum
2007-04-02 15:16:36 +02:00
committed by Greg Kroah-Hartman
parent 1941044aa9
commit ebc3ac149b
1 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/usb/misc/adutux.c
View File

@@ -285,6 +285,7 @@ static int adu_open(struct inode *inode, struct file *file)
/* save device in the file's private structure */ /* save device in the file's private structure */
file->private_data = dev; file->private_data = dev;
if (dev->open_count == 1) {
/* initialize in direction */ /* initialize in direction */
dev->read_buffer_length = 0; dev->read_buffer_length = 0;
@@ -298,10 +299,10 @@ static int adu_open(struct inode *inode, struct file *file)
dev->interrupt_in_endpoint->bInterval); dev->interrupt_in_endpoint->bInterval);
/* dev->interrupt_in_urb->transfer_flags |= URB_ASYNC_UNLINK; */ /* dev->interrupt_in_urb->transfer_flags |= URB_ASYNC_UNLINK; */
dev->read_urb_finished = 0; dev->read_urb_finished = 0;
usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL); retval = usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL);
/* we ignore failure */ if (retval)
/* end of fixup for first read */ --dev->open_count;
}
up(&dev->sem); up(&dev->sem);
exit_no_device: exit_no_device:
@@ -469,7 +470,7 @@ static ssize_t adu_read(struct file *file, __user char *buffer, size_t count,
adu_interrupt_in_callback, adu_interrupt_in_callback,
dev, dev,
dev->interrupt_in_endpoint->bInterval); dev->interrupt_in_endpoint->bInterval);
retval = usb_submit_urb(dev->interrupt_in_urb, GFP_KERNEL); retval = usb_submit_urb(dev->interrupt_in_urb, GFP_ATOMIC);
if (!retval) { if (!retval) {
spin_unlock_irqrestore(&dev->buflock, flags); spin_unlock_irqrestore(&dev->buflock, flags);
dbg(2," %s : submitted OK", __FUNCTION__); dbg(2," %s : submitted OK", __FUNCTION__);
@@ -539,7 +540,7 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
size_t bytes_written = 0; size_t bytes_written = 0;
size_t bytes_to_write; size_t bytes_to_write;
size_t buffer_size; size_t buffer_size;
int retval = 0; int retval;
int timeout = 0; int timeout = 0;
dbg(2," %s : enter, count = %Zd", __FUNCTION__, count); dbg(2," %s : enter, count = %Zd", __FUNCTION__, count);
@@ -547,7 +548,9 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
dev = file->private_data; dev = file->private_data;
/* lock this object */ /* lock this object */
down_interruptible(&dev->sem); retval = down_interruptible(&dev->sem);
if (retval)
goto exit_nolock;
/* verify that the device wasn't unplugged */ /* verify that the device wasn't unplugged */
if (dev->udev == NULL || dev->minor == 0) { if (dev->udev == NULL || dev->minor == 0) {
@@ -575,7 +578,11 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
} }
up(&dev->sem); up(&dev->sem);
timeout = interruptible_sleep_on_timeout(&dev->write_wait, timeout); timeout = interruptible_sleep_on_timeout(&dev->write_wait, timeout);
down_interruptible(&dev->sem); retval = down_interruptible(&dev->sem);
if (retval) {
retval = bytes_written ? bytes_written : retval;
goto exit_nolock;
}
if (timeout > 0) { if (timeout > 0) {
break; break;
} }
@@ -637,6 +644,7 @@ static ssize_t adu_write(struct file *file, const __user char *buffer,
exit: exit:
/* unlock the device */ /* unlock the device */
up(&dev->sem); up(&dev->sem);
exit_nolock:
dbg(2," %s : leave, return value %d", __FUNCTION__, retval); dbg(2," %s : leave, return value %d", __FUNCTION__, retval);