usb_wwan: fix error in marking device busy

This fixes two errors:
- the device is busy if a message was recieved even if resubmission fails
- the device is not busy if resubmission fails due to -EPERM

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index b004b2a485c38765570193d5e162f8172c9e00a1..7bd06854f87236735f866809f04915cf00b8cfb0 100644 (file)
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -305,11 +305,16 @@ static void usb_wwan_indat_callback(struct urb *urb)
                /* Resubmit urb so we continue receiving */
                if (status != -ESHUTDOWN) {
                        err = usb_submit_urb(urb, GFP_ATOMIC);
-                       if (err && err != -EPERM)
-                               printk(KERN_ERR "%s: resubmit read urb failed. "
-                                      "(%d)", __func__, err);
-                       else
+                       if (err) {
+                               if (err != -EPERM) {
+                                       printk(KERN_ERR "%s: resubmit read urb failed. "
+                                               "(%d)", __func__, err);
+                                       /* busy also in error unless we are killed */
+                                       usb_mark_last_busy(port->serial->dev);
+                               }
+                       } else {
                                usb_mark_last_busy(port->serial->dev);
+                       }
                }
 
        }