orinoco_usb: fix interface sanity check

Make sure to use the current alternate setting when verifying the
interface descriptors to avoid binding to an invalid interface.

Failing to do so could cause the driver to misbehave or trigger a WARN()
in usb_submit_urb() that kernels with panic_on_warn set would choke on.

Fixes: 9afac70a7305 ("orinoco: add orinoco_usb driver")
Cc: stable <stable@vger.kernel.org>     # 2.6.35
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
index 40a8b94..8c79b96 100644 (file)
--- a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
+++ b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
@@ -1608,9 +1608,9 @@ static int ezusb_probe(struct usb_interface *interface,
        /* set up the endpoint information */
        /* check out the endpoints */
 
-       iface_desc = &interface->altsetting[0].desc;
+       iface_desc = &interface->cur_altsetting->desc;
        for (i = 0; i < iface_desc->bNumEndpoints; ++i) {
-               ep = &interface->altsetting[0].endpoint[i].desc;
+               ep = &interface->cur_altsetting->endpoint[i].desc;
 
                if (usb_endpoint_is_bulk_in(ep)) {
                        /* we found a bulk in endpoint */