USB: drivers/usb fixups due to USB structure changes.

diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
index 9017e760fc538a41bb1c72fe61fb128f3bbbc90d..9d9cfe6f7f601834ba0eb013b60a98239ef5f66e 100644 (file)
--- a/drivers/usb/image/microtek.c
+++ b/drivers/usb/image/microtek.c
@@ -914,7 +914,7 @@ static int mts_usb_probe (struct usb_interface *intf,
                return -ENODEV;
        }
 
-       result = usb_set_interface(dev, altsetting->bInterfaceNumber, 0);
+       result = usb_set_interface(dev, altsetting->desc.bInterfaceNumber, 0);
 
        MTS_DEBUG("usb_set_interface returned %d.\n",result);
        switch( result )

diff --git a/drivers/usb/media/stv680.c b/drivers/usb/media/stv680.c
index 3b048bd3152a2fa3b175b9e238fab888319999d5..4e341c3b94cb0815a47d72d4c55a0ebf5cf5434c 100644 (file)
--- a/drivers/usb/media/stv680.c
+++ b/drivers/usb/media/stv680.c
@@ -1451,7 +1451,7 @@ static struct video_device stv680_template = {
 static int stv680_probe (struct usb_interface *intf, const struct usb_device_id *id)
 {
        struct usb_device *dev = interface_to_usbdev(intf);
-       struct usb_interface_descriptor *interface;
+       struct usb_host_interface *interface;
        struct usb_stv *stv680;
        char *camera_name = NULL;
 

diff --git a/drivers/usb/misc/speedtouch.c b/drivers/usb/misc/speedtouch.c
index fae8e61320f41e426e98948c7bbd20e3dd46b844..50118caa0e44224c5d9bffe2e87e1e378cd9f412 100644 (file)
--- a/drivers/usb/misc/speedtouch.c
+++ b/drivers/usb/misc/speedtouch.c
@@ -917,7 +917,7 @@ static int udsl_usb_ioctl (struct usb_interface *intf, unsigned int code, void *
 static int udsl_usb_probe (struct usb_interface *intf, const struct usb_device_id *id)
 {
        struct usb_device *dev = interface_to_usbdev(intf);
-       int ifnum = intf->altsetting->bInterfaceNumber;
+       int ifnum = intf->altsetting->desc.bInterfaceNumber;
        int i;
        unsigned char mac[6];
        unsigned char mac_str[13];

diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c
index 36efa886c9e0094e65837dd8d84f2eb790b389e1..3756af894c201e3171819d0b1b94e72311c5d0f8 100644 (file)
--- a/drivers/usb/misc/uss720.c
+++ b/drivers/usb/misc/uss720.c
@@ -549,8 +549,8 @@ static int uss720_probe(struct usb_interface *intf,
                        const struct usb_device_id *id)
 {
        struct usb_device *usbdev = interface_to_usbdev(intf);
-       struct usb_interface_descriptor *interface;
-       struct usb_endpoint_descriptor *endpoint;
+       struct usb_host_interface *interface;
+       struct usb_host_endpoint *endpoint;
        struct parport_uss720_private *priv;
        struct parport *pp;
        int i;
@@ -562,7 +562,7 @@ static int uss720_probe(struct usb_interface *intf,
        if (intf->num_altsetting != 3)
                return -ENODEV;
 
-       i = usb_set_interface(usbdev, intf->altsetting->bInterfaceNumber, 2);
+       i = usb_set_interface(usbdev, intf->altsetting->desc.bInterfaceNumber, 2);
        printk(KERN_DEBUG "uss720: set inteface result %d\n", i);
 
        interface = &intf->altsetting[2];
@@ -593,7 +593,7 @@ static int uss720_probe(struct usb_interface *intf,
               priv->reg[0], priv->reg[1], priv->reg[2], priv->reg[3], priv->reg[4], priv->reg[5], priv->reg[6]);
 
        endpoint = &interface->endpoint[2];
-       printk(KERN_DEBUG "uss720: epaddr %d interval %d\n", endpoint->bEndpointAddress, endpoint->bInterval);
+       printk(KERN_DEBUG "uss720: epaddr %d interval %d\n", endpoint->desc.bEndpointAddress, endpoint->desc.bInterval);
 #if 0
        priv->irqpipe = usb_rcvctrlpipe(usbdev, endpoint->bEndpointAddress);
        i = usb_request_irq(usbdev, priv->irqpipe,