aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/class/cdc-acm.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2014-05-26 13:23:49 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-27 18:04:10 -0400
commit4a8ee5059a241114c644350b6cb564c729a340fa (patch)
tree7f16ba87cb1a1a277055bca4579178395092b0b4 /drivers/usb/class/cdc-acm.c
parentb1d42efc217fdc1a6a704b344fd902ae52a012c8 (diff)
USB: cdc-acm: do not update PM busy on read errors
There's no need to update the runtime PM last_busy field on read urb errors (e.g. when the urb is being killed on shutdown). Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
-rw-r--r--drivers/usb/class/cdc-acm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index f038f390db97..3c7cfac48e30 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -416,13 +416,15 @@ static void acm_read_bulk_callback(struct urb *urb)
416 dev_dbg(&acm->data->dev, "%s - disconnected\n", __func__); 416 dev_dbg(&acm->data->dev, "%s - disconnected\n", __func__);
417 return; 417 return;
418 } 418 }
419 usb_mark_last_busy(acm->dev);
420 419
421 if (urb->status) { 420 if (urb->status) {
422 dev_dbg(&acm->data->dev, "%s - non-zero urb status: %d\n", 421 dev_dbg(&acm->data->dev, "%s - non-zero urb status: %d\n",
423 __func__, urb->status); 422 __func__, urb->status);
424 return; 423 return;
425 } 424 }
425
426 usb_mark_last_busy(acm->dev);
427
426 acm_process_read_urb(acm, urb); 428 acm_process_read_urb(acm, urb);
427 429
428 /* throttle device if requested by tty */ 430 /* throttle device if requested by tty */