lirc-utils-oss/kernel-2.6.20.patch

   1 --- drivers/lirc_atiusb/lirc_atiusb.c   2006/10/20 05:03:38     1.55
   2 +++ drivers/lirc_atiusb/lirc_atiusb.c   2007/01/16 08:45:04     1.56
   3 @@ -251,7 +251,7 @@
   4         add_wait_queue(&oep->wait, &wait);
   5
   6  #ifdef KERNEL_2_5
   7 -       if (usb_submit_urb(oep->urb, SLAB_ATOMIC)) {
   8 +       if (usb_submit_urb(oep->urb, GFP_ATOMIC)) {
   9  #else
  10         if (usb_submit_urb(oep->urb)) {
  11  #endif
  12 @@ -323,7 +323,7 @@
  13                         iep->urb->dev = ir->usbdev;
  14                         dprintk(DRIVER_NAME "[%d]: linking iep 0x%02x (%p)\n", ir->devnum, iep->ep->bEndpointAddress, iep);
  15  #ifdef KERNEL_2_5
  16 -                       if ((rtn = usb_submit_urb(iep->urb, SLAB_ATOMIC)) < 0) {
  17 +                       if ((rtn = usb_submit_urb(iep->urb, GFP_ATOMIC)) < 0) {
  18  #else
  19                         if ((rtn = usb_submit_urb(iep->urb)) < 0) {
  20  #endif
  21 @@ -659,7 +659,7 @@
  22
  23         /* resubmit urb */
  24  #ifdef KERNEL_2_5
  25 -       usb_submit_urb(urb, SLAB_ATOMIC);
  26 +       usb_submit_urb(urb, GFP_ATOMIC);
  27  #endif
  28  }
  29
  30 @@ -775,7 +775,7 @@
  31                 iep->len = len;
  32
  33  #ifdef KERNEL_2_5
  34 -               if ( !(iep->buf = usb_buffer_alloc(dev, len, SLAB_ATOMIC, &iep->dma)) ) {
  35 +               if ( !(iep->buf = usb_buffer_alloc(dev, len, GFP_ATOMIC, &iep->dma)) ) {
  36                         mem_failure = 2;
  37                 } else if ( !(iep->urb = usb_alloc_urb(0, GFP_KERNEL)) ) {
  38                         mem_failure = 3;
  39 @@ -856,7 +856,7 @@
  40                 init_waitqueue_head(&oep->wait);
  41
  42  #ifdef KERNEL_2_5
  43 -               if ( !(oep->buf = usb_buffer_alloc(dev, USB_OUTLEN, SLAB_ATOMIC, &oep->dma)) ) {
  44 +               if ( !(oep->buf = usb_buffer_alloc(dev, USB_OUTLEN, GFP_ATOMIC, &oep->dma)) ) {
  45                         mem_failure = 2;
  46                 } else if ( !(oep->urb = usb_alloc_urb(0, GFP_KERNEL)) ) {
  47                         mem_failure = 3;
  48 --- drivers/lirc_igorplugusb/lirc_igorplugusb.c 2006/10/20 05:03:38     1.9
  49 +++ drivers/lirc_igorplugusb/lirc_igorplugusb.c 2007/01/16 08:45:04     1.10
  50 @@ -484,7 +484,7 @@
  51  #if defined(KERNEL_2_5)
  52                 } else if (!(ir->buf_in = usb_buffer_alloc(dev,
  53                                 DEVICE_BUFLEN+DEVICE_HEADERLEN,
  54 -                                SLAB_ATOMIC, &ir->dma_in))) {
  55 +                                GFP_ATOMIC, &ir->dma_in))) {
  56                         mem_failure = 5;
  57  #else
  58                 } else if (!(ir->buf_in = kmalloc(
  59 --- drivers/lirc_mceusb/lirc_mceusb.c   2006/10/20 05:03:38     1.13
  60 +++ drivers/lirc_mceusb/lirc_mceusb.c   2007/01/16 08:45:04     1.14
  61 @@ -768,7 +768,7 @@
  62                         dev->bulk_in_endpointAddr = endpoint->bEndpointAddress;
  63  #ifdef KERNEL_2_5
  64                         dev->bulk_in_buffer = usb_buffer_alloc
  65 -                               (udev, buffer_size, SLAB_ATOMIC, &dev->dma_in);
  66 +                               (udev, buffer_size, GFP_ATOMIC, &dev->dma_in);
  67  #else
  68                         dev->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
  69  #endif
  70 @@ -795,7 +795,7 @@
  71                         dev->bulk_out_size = buffer_size;
  72                         dev->bulk_out_endpointAddr = endpoint->bEndpointAddress;
  73  #ifdef KERNEL_2_5
  74 -                       dev->bulk_out_buffer = usb_buffer_alloc(udev, buffer_size, SLAB_ATOMIC, &dev->dma_out);
  75 +                       dev->bulk_out_buffer = usb_buffer_alloc(udev, buffer_size, GFP_ATOMIC, &dev->dma_out);
  76  #else
  77                         dev->bulk_out_buffer = kmalloc (buffer_size, GFP_KERNEL);
  78  #endif
  79 --- drivers/lirc_mceusb2/lirc_mceusb2.c 2007/01/16 06:05:27     1.22
  80 +++ drivers/lirc_mceusb2/lirc_mceusb2.c 2007/01/16 08:45:04     1.23
  81 @@ -264,7 +264,7 @@
  82         async_urb->transfer_buffer_length = size;
  83         async_urb->dev = ir->usbdev;
  84
  85 -       if ((res=usb_submit_urb(async_urb, SLAB_ATOMIC))) {
  86 +       if ((res=usb_submit_urb(async_urb, GFP_ATOMIC))) {
  87             dprintk(DRIVER_NAME "[%d]: receive request FAILED! (res=%d)\n", ir->devnum, res);
  88             return;
  89         }
  90 @@ -467,7 +467,7 @@
  91         }
  92
  93         /* resubmit urb */
  94 -       usb_submit_urb(urb, SLAB_ATOMIC);
  95 +       usb_submit_urb(urb, GFP_ATOMIC);
  96  }
  97
  98
  99 @@ -703,7 +703,7 @@
 100                         mem_failure = 3;
 101                 } else if (lirc_buffer_init(rbuf, sizeof(lirc_t), LIRCBUF_SIZE)) {
 102                         mem_failure = 4;
 103 -               } else if (!(ir->buf_in = usb_buffer_alloc(dev, maxp, SLAB_ATOMIC, &ir->dma_in))) {
 104 +               } else if (!(ir->buf_in = usb_buffer_alloc(dev, maxp, GFP_ATOMIC, &ir->dma_in))) {
 105                         mem_failure = 5;
 106                 } else if (!(ir->urb_in = usb_alloc_urb(0, GFP_KERNEL))) {
 107                         mem_failure = 7;
 108 --- drivers/lirc_streamzap/lirc_streamzap.c     2006/12/01 04:11:52     1.18
 109 +++ drivers/lirc_streamzap/lirc_streamzap.c     2007/01/16 08:45:04     1.19
 110 @@ -458,7 +458,7 @@
 111
 112  #ifdef KERNEL_2_5
 113         /* resubmit only for 2.6 */
 114 -       usb_submit_urb( urb, SLAB_ATOMIC );
 115 +       usb_submit_urb( urb, GFP_ATOMIC );
 116  #endif
 117
 118         return;
 119 @@ -556,7 +556,7 @@
 120         sz->buf_in_len = sz->endpoint->wMaxPacketSize;
 121  #ifdef KERNEL_2_5
 122          if((sz->buf_in = usb_buffer_alloc(sz->udev, sz->buf_in_len,
 123 -                                         SLAB_ATOMIC, &sz->dma_in)) == NULL )
 124 +                                         GFP_ATOMIC, &sz->dma_in)) == NULL )
 125         {
 126                  goto error;
 127         }
 128 @@ -715,7 +715,7 @@
 129
 130         sz->urb_in->dev = sz->udev;
 131  #ifdef KERNEL_2_5
 132 -       if (usb_submit_urb(sz->urb_in, SLAB_ATOMIC))
 133 +       if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))
 134  #else
 135         if (usb_submit_urb(sz->urb_in))
 136  #endif
 137 @@ -866,7 +866,7 @@
 138
 139                 sz->urb_in->dev = sz->udev;
 140  #ifdef KERNEL_2_5
 141 -               if (usb_submit_urb(sz->urb_in, SLAB_ATOMIC))
 142 +               if (usb_submit_urb(sz->urb_in, GFP_ATOMIC))
 143  #else
 144                 if (usb_submit_urb(sz->urb_in))
 145  #endif