All pastes #371944 Raw Edit

dr.bombay

public text v1 · immutable
#371944 ·published 2007-02-25 19:40 UTC
rendered paste body
***************
*** 180,188 ****
         period = max ((int) dev->status->desc.bInterval,
                 (dev->udev->speed == USB_SPEED_HIGH) ? 7 : 3);
  
-        buf = kmalloc (maxp, SLAB_KERNEL);
         if (buf) {
-                dev->interrupt = usb_alloc_urb (0, SLAB_KERNEL);
                 if (!dev->interrupt) {
                         kfree (buf);
                         return -ENOMEM;
--- 180,188 ----
         period = max ((int) dev->status->desc.bInterval,
                 (dev->udev->speed == USB_SPEED_HIGH) ? 7 : 3);
  
+        buf = kmalloc (maxp, GFP_KERNEL);
         if (buf) {
+                dev->interrupt = usb_alloc_urb (0, GFP_KERNEL);
                 if (!dev->interrupt) {
                         kfree (buf);
                         return -ENOMEM;
***************
*** 1150,1156 ****
         skb_queue_head_init (&dev->done);
         dev->bh.func = usbnet_bh;
         dev->bh.data = (unsigned long) dev;
-        INIT_WORK (&dev->kevent, kevent, dev);
         dev->delay.function = usbnet_bh;
         dev->delay.data = (unsigned long) dev;
         init_timer (&dev->delay);
--- 1150,1156 ----
         skb_queue_head_init (&dev->done);
         dev->bh.func = usbnet_bh;
         dev->bh.data = (unsigned long) dev;
+        INIT_WORK (&dev->kevent, kevent);
         dev->delay.function = usbnet_bh;
         dev->delay.data = (unsigned long) dev;
         init_timer (&dev->delay);