Commit c868e47d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

[PATCH] USB: remove act_altsetting usages in the remaining drivers/usb/ drivers

parent b2144480
...@@ -700,7 +700,7 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de ...@@ -700,7 +700,7 @@ static int ati_remote_probe(struct usb_interface *interface, const struct usb_de
return -ENOMEM; return -ENOMEM;
memset(ati_remote, 0x00, sizeof (struct ati_remote)); memset(ati_remote, 0x00, sizeof (struct ati_remote));
iface_host = &interface->altsetting[interface->act_altsetting]; iface_host = interface->cur_altsetting;
if (iface_host->desc.bNumEndpoints != 2) { if (iface_host->desc.bNumEndpoints != 2) {
err("%s: Unexpected desc.bNumEndpoints\n", __FUNCTION__); err("%s: Unexpected desc.bNumEndpoints\n", __FUNCTION__);
retval = -ENODEV; retval = -ENODEV;
......
...@@ -1445,7 +1445,7 @@ static void hid_free_buffers(struct usb_device *dev, struct hid_device *hid) ...@@ -1445,7 +1445,7 @@ static void hid_free_buffers(struct usb_device *dev, struct hid_device *hid)
static struct hid_device *usb_hid_configure(struct usb_interface *intf) static struct hid_device *usb_hid_configure(struct usb_interface *intf)
{ {
struct usb_host_interface *interface = intf->altsetting + intf->act_altsetting; struct usb_host_interface *interface = intf->cur_altsetting;
struct usb_device *dev = interface_to_usbdev (intf); struct usb_device *dev = interface_to_usbdev (intf);
struct hid_descriptor *hdesc; struct hid_descriptor *hdesc;
struct hid_device *hid; struct hid_device *hid;
......
...@@ -217,7 +217,7 @@ static int mtouchusb_probe(struct usb_interface *intf, const struct usb_device_i ...@@ -217,7 +217,7 @@ static int mtouchusb_probe(struct usb_interface *intf, const struct usb_device_i
} }
dbg("%s - setting interface", __FUNCTION__); dbg("%s - setting interface", __FUNCTION__);
interface = &intf->altsetting[intf->act_altsetting]; interface = intf->cur_altsetting;
dbg("%s - setting endpoint", __FUNCTION__); dbg("%s - setting endpoint", __FUNCTION__);
endpoint = &interface->endpoint[0].desc; endpoint = &interface->endpoint[0].desc;
......
...@@ -3009,7 +3009,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) ...@@ -3009,7 +3009,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
return -ENODEV; return -ENODEV;
} }
xdev = interface_to_usbdev (udev); xdev = interface_to_usbdev (udev);
interface = &udev->altsetting [udev->act_altsetting]; interface = udev->cur_altsetting;
usb_get_dev (xdev); usb_get_dev (xdev);
......
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