From aea87e6cd42387334801758d956121a8d44dae0e Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@sphairon.com>
Date: Tue, 8 Dec 2009 15:21:35 +0100
Subject: [PATCH] --- yaml --- r: 183315 b: refs/heads/master c:
 11466f1342a3400dd5e03da3d8c45aa4149c62d4 h: refs/heads/master i:   183313:
 ce5b093b86f61f0fd464e97334166d41b73fb6e6   183311:
 226195c0c9efc0c0ab107f206e25d3441f665775 v: v3

---
 [refs]                                       |  2 +-
 trunk/drivers/net/wireless/zd1211rw/zd_usb.c | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f255c5b84d99..09503125030c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b6e2f12edd6c46e87a2775321f1912d19be4b35
+refs/heads/master: 11466f1342a3400dd5e03da3d8c45aa4149c62d4
diff --git a/trunk/drivers/net/wireless/zd1211rw/zd_usb.c b/trunk/drivers/net/wireless/zd1211rw/zd_usb.c
index ac19ecd19cfe..4daf1c94ec04 100644
--- a/trunk/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/trunk/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -1078,11 +1078,15 @@ static int eject_installer(struct usb_interface *intf)
 	int r;
 
 	/* Find bulk out endpoint */
-	endpoint = &iface_desc->endpoint[1].desc;
-	if (usb_endpoint_dir_out(endpoint) &&
-	    usb_endpoint_xfer_bulk(endpoint)) {
-		bulk_out_ep = endpoint->bEndpointAddress;
-	} else {
+	for (r = 1; r >= 0; r--) {
+		endpoint = &iface_desc->endpoint[r].desc;
+		if (usb_endpoint_dir_out(endpoint) &&
+		    usb_endpoint_xfer_bulk(endpoint)) {
+			bulk_out_ep = endpoint->bEndpointAddress;
+			break;
+		}
+	}
+	if (r == -1) {
 		dev_err(&udev->dev,
 			"zd1211rw: Could not find bulk out endpoint\n");
 		return -ENODEV;