USB: usb serial driver fixes due to USB structure changes.

diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c
index df4b5ff95a7bf26474d5e8402b586fba0d8dad3a..4ac6d31bfd38ac05edfd3c85a25a727df7eaea9c 100644 (file)
--- a/drivers/usb/serial/io_ti.c
+++ b/drivers/usb/serial/io_ti.c
@@ -588,10 +588,10 @@ static int TIChooseConfiguration (struct usb_device *dev)
        // we want. However, we just support one config at this point,
        // configuration # 1, which is Config Descriptor 0.
 
-       dbg ("%s - Number of Interfaces = %d", __FUNCTION__, dev->config->bNumInterfaces);
-       dbg ("%s - MAX Power            = %d", __FUNCTION__, dev->config->MaxPower*2);
+       dbg ("%s - Number of Interfaces = %d", __FUNCTION__, dev->config->desc.bNumInterfaces);
+       dbg ("%s - MAX Power            = %d", __FUNCTION__, dev->config->desc.bMaxPower*2);
 
-       if (dev->config->bNumInterfaces != 1) {
+       if (dev->config->desc.bNumInterfaces != 1) {
                err ("%s - bNumInterfaces is not 1, ERROR!", __FUNCTION__);
                return -ENODEV;
        }
@@ -980,7 +980,7 @@ static int TIDownloadFirmware (struct edgeport_serial *serial)
        if (status)
                return status;
 
-       interface = serial->serial->dev->config->interface->altsetting;
+       interface = &serial->serial->dev->config->interface->altsetting->desc;
        if (!interface) {
                err ("%s - no interface set, error!", __FUNCTION__);
                return -ENODEV;

diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c
index bea9ceae59cfb7bcb57b352fe59ec9a688b33b15..31301e598125b48bba3aa7f20c9c4e1d16813004 100644 (file)
--- a/drivers/usb/serial/safe_serial.c
+++ b/drivers/usb/serial/safe_serial.c
@@ -393,7 +393,7 @@ static int safe_write_room (struct usb_serial_port *port)
 
 static int safe_startup (struct usb_serial *serial)
 {
-       switch (serial->interface->altsetting->bInterfaceProtocol) {
+       switch (serial->interface->altsetting->desc.bInterfaceProtocol) {
        case LINEO_SAFESERIAL_CRC:
                break;
        case LINEO_SAFESERIAL_CRC_PADDED:

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 04e252d7b63b1c8116cc89fdcdd47f9b60ffaab4..75510b41e8abe286beee7e257994b3048c3f88e0 100644 (file)
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -1250,7 +1250,7 @@ int usb_serial_probe(struct usb_interface *interface,
                        interface = &dev->actconfig->interface[0];
                        iface_desc = &interface->altsetting[0];
                        for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
-                               endpoint = &iface_desc->endpoint[i];
+                               endpoint = &iface_desc->endpoint[i].desc;
                                if ((endpoint->bEndpointAddress & 0x80) &&
                                    ((endpoint->bmAttributes & 3) == 0x03)) {
                                        /* we found a interrupt in endpoint */