]>
Commit | Line | Data |
---|---|---|
45a123f6 | 1 | diff -Naur -X /home/marcelo/lib/dontdiff linux-2.4.19/drivers/char/joystick/iforce.c linux-2.4.20/drivers/char/joystick/iforce.c |
2 | --- linux-2.4.19/drivers/char/joystick/iforce.c 2001-09-12 22:34:06.000000000 +0000 | |
3 | +++ linux-2.4.20/drivers/char/joystick/iforce.c 2002-10-29 11:18:33.000000000 +0000 | |
4 | @@ -134,7 +134,7 @@ | |
5 | #ifdef IFORCE_USB | |
6 | struct usb_device *usbdev; /* USB transfer */ | |
7 | struct urb irq, out, ctrl; | |
8 | - devrequest dr; | |
9 | + struct usb_ctrlrequest dr; | |
10 | #endif | |
11 | /* Force Feedback */ | |
12 | wait_queue_head_t wait; | |
13 | @@ -283,7 +283,7 @@ | |
14 | #ifdef IFORCE_USB | |
15 | case IFORCE_USB: | |
16 | ||
17 | - iforce->dr.request = packet[0]; | |
18 | + iforce->dr.bRequest = packet[0]; | |
19 | iforce->ctrl.dev = iforce->usbdev; | |
20 | ||
21 | set_current_state(TASK_INTERRUPTIBLE); | |
22 | @@ -1027,9 +1027,9 @@ | |
23 | iforce->bus = IFORCE_USB; | |
24 | iforce->usbdev = dev; | |
25 | ||
26 | - iforce->dr.requesttype = USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE; | |
27 | - iforce->dr.index = 0; | |
28 | - iforce->dr.length = 16; | |
29 | + iforce->dr.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE; | |
30 | + iforce->dr.wIndex = 0; | |
31 | + iforce->dr.wLength = 16; | |
32 | ||
33 | FILL_INT_URB(&iforce->irq, dev, usb_rcvintpipe(dev, epirq->bEndpointAddress), | |
34 | iforce->data, 16, iforce_usb_irq, iforce, epirq->bInterval); |