diff options
Diffstat (limited to 'drivers/usb/net/usbnet.c')
| -rw-r--r-- | drivers/usb/net/usbnet.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c index 7672e11c94c4..327f97555679 100644 --- a/drivers/usb/net/usbnet.c +++ b/drivers/usb/net/usbnet.c | |||
| @@ -782,9 +782,10 @@ static struct ethtool_ops usbnet_ethtool_ops = { | |||
| 782 | * especially now that control transfers can be queued. | 782 | * especially now that control transfers can be queued. |
| 783 | */ | 783 | */ |
| 784 | static void | 784 | static void |
| 785 | kevent (void *data) | 785 | kevent (struct work_struct *work) |
| 786 | { | 786 | { |
| 787 | struct usbnet *dev = data; | 787 | struct usbnet *dev = |
| 788 | container_of(work, struct usbnet, kevent); | ||
| 788 | int status; | 789 | int status; |
| 789 | 790 | ||
| 790 | /* usb_clear_halt() needs a thread context */ | 791 | /* usb_clear_halt() needs a thread context */ |
| @@ -1146,7 +1147,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) | |||
| 1146 | skb_queue_head_init (&dev->done); | 1147 | skb_queue_head_init (&dev->done); |
| 1147 | dev->bh.func = usbnet_bh; | 1148 | dev->bh.func = usbnet_bh; |
| 1148 | dev->bh.data = (unsigned long) dev; | 1149 | dev->bh.data = (unsigned long) dev; |
| 1149 | INIT_WORK (&dev->kevent, kevent, dev); | 1150 | INIT_WORK (&dev->kevent, kevent); |
| 1150 | dev->delay.function = usbnet_bh; | 1151 | dev->delay.function = usbnet_bh; |
| 1151 | dev->delay.data = (unsigned long) dev; | 1152 | dev->delay.data = (unsigned long) dev; |
| 1152 | init_timer (&dev->delay); | 1153 | init_timer (&dev->delay); |
