aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/option.c
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2010-02-17 10:05:47 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-02 17:55:12 -0500
commit1f87158e44e79e62c8250f278c225ce4ab695f4b (patch)
treeeff328f63a75993a3e1ffbba9c9f0ba1fecf0edb /drivers/usb/serial/option.c
parenta108bfcb372d8c4452701039308fb95747911c59 (diff)
USB: remove references to port->port.count from the serial drivers
This patch (as1344) removes references to port->port.count from the USB serial drivers. Now that serial ports are properly reference counted, port.count checking is unnecessary and incorrect. Drivers should assume that the port is in use from the time the open method runs until the close method is called. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/option.c')
-rw-r--r--drivers/usb/serial/option.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 68c7457a98a..db0541c5df7 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -971,9 +971,9 @@ static void option_indat_callback(struct urb *urb)
971 tty_kref_put(tty); 971 tty_kref_put(tty);
972 972
973 /* Resubmit urb so we continue receiving */ 973 /* Resubmit urb so we continue receiving */
974 if (port->port.count && status != -ESHUTDOWN) { 974 if (status != -ESHUTDOWN) {
975 err = usb_submit_urb(urb, GFP_ATOMIC); 975 err = usb_submit_urb(urb, GFP_ATOMIC);
976 if (err) 976 if (err && err != -EPERM)
977 printk(KERN_ERR "%s: resubmit read urb failed. " 977 printk(KERN_ERR "%s: resubmit read urb failed. "
978 "(%d)", __func__, err); 978 "(%d)", __func__, err);
979 else 979 else