aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLu Baolu <baolu.lu@linux.intel.com>2015-12-29 23:59:08 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-01-25 00:06:21 -0500
commit19454462acb1bdef80542061bdc9b410e4ed1ff6 (patch)
tree8020236445dcbfe2f75ffe32df70f54d8067da0c
parent92e963f50fc74041b5e9e744c330dca48e04f08d (diff)
usb: cdc-acm: handle unlinked urb in acm read callback
In current acm driver, the bulk-in callback function ignores the URBs unlinked in usb core. This causes unexpected data loss in some cases. For example, runtime suspend entry will unlinked all urbs and set urb->status to -ENOENT even those urbs might have data not processed yet. Hence, data loss occurs. This patch lets bulk-in callback function handle unlinked urbs to avoid data loss. Signed-off-by: Tang Jian Qiang <jianqiang.tang@intel.com> Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com> Cc: stable@vger.kernel.org Acked-by: Oliver Neukum <oneukum@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/class/cdc-acm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 26ca4f910cb0..8cd193bbd044 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -428,7 +428,8 @@ static void acm_read_bulk_callback(struct urb *urb)
428 set_bit(rb->index, &acm->read_urbs_free); 428 set_bit(rb->index, &acm->read_urbs_free);
429 dev_dbg(&acm->data->dev, "%s - non-zero urb status: %d\n", 429 dev_dbg(&acm->data->dev, "%s - non-zero urb status: %d\n",
430 __func__, status); 430 __func__, status);
431 return; 431 if ((status != -ENOENT) || (urb->actual_length == 0))
432 return;
432 } 433 }
433 434
434 usb_mark_last_busy(acm->dev); 435 usb_mark_last_busy(acm->dev);