Commit 40509e42 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

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

parent 63bc762f
......@@ -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;
......
......@@ -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:
......
......@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment