Commit 667a8226 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

[PATCH] USB: remove act_altsetting usages in more USB drivers

parent c868e47d
...@@ -135,7 +135,7 @@ static int iforce_usb_probe(struct usb_interface *intf, ...@@ -135,7 +135,7 @@ static int iforce_usb_probe(struct usb_interface *intf,
struct usb_endpoint_descriptor *epirq, *epout; struct usb_endpoint_descriptor *epirq, *epout;
struct iforce *iforce; struct iforce *iforce;
interface = &intf->altsetting[intf->act_altsetting]; interface = intf->cur_altsetting;
epirq = &interface->endpoint[0].desc; epirq = &interface->endpoint[0].desc;
epout = &interface->endpoint[1].desc; epout = &interface->endpoint[1].desc;
......
...@@ -1086,8 +1086,7 @@ static struct net_device_stats *stir_net_get_stats(struct net_device *dev) ...@@ -1086,8 +1086,7 @@ static struct net_device_stats *stir_net_get_stats(struct net_device *dev)
static int stir_setup_usb(struct stir_cb *stir, struct usb_interface *intf) static int stir_setup_usb(struct stir_cb *stir, struct usb_interface *intf)
{ {
struct usb_device *usbdev = interface_to_usbdev(intf); struct usb_device *usbdev = interface_to_usbdev(intf);
const struct usb_host_interface *interface const struct usb_host_interface *interface = intf->cur_altsetting;
= &intf->altsetting[intf->act_altsetting];
const struct usb_endpoint_descriptor *ep_in = NULL; const struct usb_endpoint_descriptor *ep_in = NULL;
const struct usb_endpoint_descriptor *ep_out = NULL; const struct usb_endpoint_descriptor *ep_out = NULL;
int i; int i;
......
...@@ -240,7 +240,7 @@ static int usb_kbd_probe(struct usb_interface *iface, ...@@ -240,7 +240,7 @@ static int usb_kbd_probe(struct usb_interface *iface,
char path[64]; char path[64];
char *buf; char *buf;
interface = &iface->altsetting[iface->act_altsetting]; interface = iface->cur_altsetting;
if (interface->desc.bNumEndpoints != 1) if (interface->desc.bNumEndpoints != 1)
return -ENODEV; return -ENODEV;
......
...@@ -131,7 +131,7 @@ static int usb_mouse_probe(struct usb_interface * intf, const struct usb_device_ ...@@ -131,7 +131,7 @@ static int usb_mouse_probe(struct usb_interface * intf, const struct usb_device_
char path[64]; char path[64];
char *buf; char *buf;
interface = &intf->altsetting[intf->act_altsetting]; interface = intf->cur_altsetting;
if (interface->desc.bNumEndpoints != 1) if (interface->desc.bNumEndpoints != 1)
return -ENODEV; return -ENODEV;
......
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