linux-2.4.20-rc3-iforce-USB.patch

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