From 39f2c596765d149c3dad1c698f27578324c2f0a1 Mon Sep 17 00:00:00 2001 From: Ivo van Doorn Date: Sat, 20 Dec 2008 11:00:23 +0100 Subject: [PATCH] --- yaml --- r: 129741 b: refs/heads/master c: d15cfc3ac77388f1d588c57743d5f26b15eba9a8 h: refs/heads/master i: 129739: 2c8fbf43b70108112d9dc0e80c6fd25bbb77c182 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2x00usb.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d382ca133418..ae5fdf5eb1d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00627f229c9807e4cb825a7ce36b886e2adf2229 +refs/heads/master: d15cfc3ac77388f1d588c57743d5f26b15eba9a8 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2x00usb.c b/trunk/drivers/net/wireless/rt2x00/rt2x00usb.c index 83df312ac56f..0b29d767a258 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2x00usb.c @@ -434,11 +434,11 @@ static int rt2x00usb_find_endpoints(struct rt2x00_dev *rt2x00dev) if (usb_endpoint_is_bulk_in(ep_desc)) { rt2x00usb_assign_endpoint(rt2x00dev->rx, ep_desc); - } else if (usb_endpoint_is_bulk_out(ep_desc)) { + } else if (usb_endpoint_is_bulk_out(ep_desc) && + (queue != queue_end(rt2x00dev))) { rt2x00usb_assign_endpoint(queue, ep_desc); + queue = queue_next(queue); - if (queue != queue_end(rt2x00dev)) - queue = queue_next(queue); tx_ep_desc = ep_desc; } }