diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2002-10-29 08:01:46 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-10-29 08:01:46 -0800 |
| commit | 40509e42e51c7fa37f3304c6434c92f2445ce2a5 (patch) | |
| tree | efb3e3d5367ef96fed91b8319f655de821f3b864 /drivers | |
| parent | 63bc762f9bdca7bdbef44bd6a1c0e2936f4c5096 (diff) | |
USB: usb serial driver fixes due to USB structure changes.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/serial/io_ti.c | 8 | ||||
| -rw-r--r-- | drivers/usb/serial/safe_serial.c | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/usb-serial.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index df4b5ff95a7b..4ac6d31bfd38 100644 --- 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 bea9ceae59cf..31301e598125 100644 --- 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 04e252d7b63b..75510b41e8ab 100644 --- 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 */ |