Merge commit 'v2.6.29-rc2' into x86/mm

[linux-2.6-omap-h63xx.git] / drivers / mtd / nand / alauda.c

diff --git a/drivers/mtd/nand/alauda.c b/drivers/mtd/nand/alauda.c
index 9623803948550a066ea336049c844db8c5f1e7f8..6d9649159a18ad49f88c3e89e88df39ce3906864 100644 (file)
--- a/drivers/mtd/nand/alauda.c
+++ b/drivers/mtd/nand/alauda.c
@@ -676,11 +676,11 @@ static int alauda_probe(struct usb_interface *interface,
                goto error;
 
        al->write_out = usb_sndbulkpipe(al->dev,
-                       ep_wr->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
+                       usb_endpoint_num(ep_wr));
        al->bulk_in = usb_rcvbulkpipe(al->dev,
-                       ep_in->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
+                       usb_endpoint_num(ep_in));
        al->bulk_out = usb_sndbulkpipe(al->dev,
-                       ep_out->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
+                       usb_endpoint_num(ep_out));
 
        /* second device is identical up to now */
        memcpy(al+1, al, sizeof(*al));