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

Commit e39ab592 authored Aug 16, 2007 by Alan Stern Committed by Greg Kroah-Hartman Oct 12, 2007

USB: remove unnecessary tests in isp116x and sl811



This patch (as962) cleans up some code I forgot to remove earlier in
the isp116x and sl811 HCDs.  There is no longer any need to check for
unlink-during-submit; it can't happen since the endpoint queues are
now under the protection of the HCD-private spinlock.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: David Brownell <david-b@pacbell.net>
CC: Olav Kongas <ok@artecdesign.ee>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parent f311cf58

drivers/usb/host/isp116x-hcd.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -815,12 +815,6 @@ static int isp116x_urb_enqueue(struct usb_hcd *hcd,
		}
		}

		/* in case of unlink-during-submit */
		if (urb->status != -EINPROGRESS) {
		finish_request(isp116x, ep, urb);
		ret = 0;
		goto fail;
		}
		urb->hcpriv = hep;
		start_atl_transfers(isp116x);

drivers/usb/host/sl811-hcd.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -957,17 +957,7 @@ static int sl811h_urb_enqueue(
		sofirq_on(sl811);
		}

		/* in case of unlink-during-submit */
		spin_lock(&urb->lock);
		if (urb->status != -EINPROGRESS) {
		spin_unlock(&urb->lock);
		finish_request(sl811, ep, urb, 0);
		retval = 0;
		goto fail;
		}
		urb->hcpriv = hep;
		spin_unlock(&urb->lock);

		start_transfer(sl811);
		sl811_write(sl811, SL11H_IRQ_ENABLE, sl811->irq_enable);
		fail: