Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4132cd02 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

cdc-acm: convert to not directly using urb->status



A step on the road to passing status as a parameter

Signed-off-by: default avatarOliver Neukum <oneukum@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6c8074e9
Loading
Loading
Loading
Loading
+4 −3
Original line number Original line Diff line number Diff line
@@ -428,7 +428,7 @@ static void acm_read_bulk_callback(struct urb *urb)
		return;
		return;
	}
	}


	if (urb->status) {
	if (status) {
		set_bit(rb->index, &acm->read_urbs_free);
		set_bit(rb->index, &acm->read_urbs_free);
		dev_dbg(&acm->data->dev, "%s - non-zero urb status: %d\n",
		dev_dbg(&acm->data->dev, "%s - non-zero urb status: %d\n",
							__func__, status);
							__func__, status);
@@ -462,13 +462,14 @@ static void acm_write_bulk(struct urb *urb)
	struct acm_wb *wb = urb->context;
	struct acm_wb *wb = urb->context;
	struct acm *acm = wb->instance;
	struct acm *acm = wb->instance;
	unsigned long flags;
	unsigned long flags;
	int status = urb->status;


	if (urb->status	|| (urb->actual_length != urb->transfer_buffer_length))
	if (status || (urb->actual_length != urb->transfer_buffer_length))
		dev_vdbg(&acm->data->dev, "%s - len %d/%d, status %d\n",
		dev_vdbg(&acm->data->dev, "%s - len %d/%d, status %d\n",
			__func__,
			__func__,
			urb->actual_length,
			urb->actual_length,
			urb->transfer_buffer_length,
			urb->transfer_buffer_length,
			urb->status);
			status);


	spin_lock_irqsave(&acm->write_lock, flags);
	spin_lock_irqsave(&acm->write_lock, flags);
	acm_write_done(acm, wb);
	acm_write_done(acm, wb);