diff options
| author | Oliver Neukum <oliver@neukum.org> | 2011-02-10 15:33:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 10:51:11 -0800 |
| commit | c9c4558f7874676e31ea7a74caafcf09ebbc03ed (patch) | |
| tree | bb42c86cc0768f9671b22573704503b68f6e6c62 /drivers | |
| parent | 8ab10400a037a516cc846c338f879e5bd62497ce (diff) | |
| download | linux-stable-c9c4558f7874676e31ea7a74caafcf09ebbc03ed.tar.gz linux-stable-c9c4558f7874676e31ea7a74caafcf09ebbc03ed.tar.bz2 linux-stable-c9c4558f7874676e31ea7a74caafcf09ebbc03ed.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/serial/usb_wwan.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c index b004b2a485c3..7bd06854f872 100644 --- 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); + } } } |