aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Neukum <oneukum@suse.de>2015-03-20 06:41:06 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-26 05:51:56 -0400
commit4132cd02db180d018325e26bd145a509a14fcd6b (patch)
tree7c165b3f96cf949277a849053d85ebc5decc5172
parent6c8074e90c7350f5e38caf1e8d73e98df4115403 (diff)
cdc-acm: convert to not directly using urb->status
A step on the road to passing status as a parameter Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/class/cdc-acm.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 43cb05863fac..3e15add665e2 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -428,7 +428,7 @@ static void acm_read_bulk_callback(struct urb *urb)
428 return; 428 return;
429 } 429 }
430 430
431 if (urb->status) { 431 if (status) {
432 set_bit(rb->index, &acm->read_urbs_free); 432 set_bit(rb->index, &acm->read_urbs_free);
433 dev_dbg(&acm->data->dev, "%s - non-zero urb status: %d\n", 433 dev_dbg(&acm->data->dev, "%s - non-zero urb status: %d\n",
434 __func__, status); 434 __func__, status);
@@ -462,13 +462,14 @@ static void acm_write_bulk(struct urb *urb)
462 struct acm_wb *wb = urb->context; 462 struct acm_wb *wb = urb->context;
463 struct acm *acm = wb->instance; 463 struct acm *acm = wb->instance;
464 unsigned long flags; 464 unsigned long flags;
465 int status = urb->status;
465 466
466 if (urb->status || (urb->actual_length != urb->transfer_buffer_length)) 467 if (status || (urb->actual_length != urb->transfer_buffer_length))
467 dev_vdbg(&acm->data->dev, "%s - len %d/%d, status %d\n", 468 dev_vdbg(&acm->data->dev, "%s - len %d/%d, status %d\n",
468 __func__, 469 __func__,
469 urb->actual_length, 470 urb->actual_length,
470 urb->transfer_buffer_length, 471 urb->transfer_buffer_length,
471 urb->status); 472 status);
472 473
473 spin_lock_irqsave(&acm->write_lock, flags); 474 spin_lock_irqsave(&acm->write_lock, flags);
474 acm_write_done(acm, wb); 475 acm_write_done(acm, wb);