diff options
Diffstat (limited to 'drivers/usb/net')
-rw-r--r-- | drivers/usb/net/rndis_host.c | 2 | ||||
-rw-r--r-- | drivers/usb/net/usbnet.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/net/rndis_host.c b/drivers/usb/net/rndis_host.c index c2a28d88ef3c..99f26b3e502f 100644 --- a/drivers/usb/net/rndis_host.c +++ b/drivers/usb/net/rndis_host.c | |||
@@ -469,7 +469,7 @@ static void rndis_unbind(struct usbnet *dev, struct usb_interface *intf) | |||
469 | struct rndis_halt *halt; | 469 | struct rndis_halt *halt; |
470 | 470 | ||
471 | /* try to clear any rndis state/activity (no i/o from stack!) */ | 471 | /* try to clear any rndis state/activity (no i/o from stack!) */ |
472 | halt = kcalloc(1, sizeof *halt, SLAB_KERNEL); | 472 | halt = kcalloc(1, sizeof *halt, GFP_KERNEL); |
473 | if (halt) { | 473 | if (halt) { |
474 | halt->msg_type = RNDIS_MSG_HALT; | 474 | halt->msg_type = RNDIS_MSG_HALT; |
475 | halt->msg_len = ccpu2(sizeof *halt); | 475 | halt->msg_len = ccpu2(sizeof *halt); |
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c index 327f97555679..6e39e9988259 100644 --- a/drivers/usb/net/usbnet.c +++ b/drivers/usb/net/usbnet.c | |||
@@ -179,9 +179,9 @@ static int init_status (struct usbnet *dev, struct usb_interface *intf) | |||
179 | period = max ((int) dev->status->desc.bInterval, | 179 | period = max ((int) dev->status->desc.bInterval, |
180 | (dev->udev->speed == USB_SPEED_HIGH) ? 7 : 3); | 180 | (dev->udev->speed == USB_SPEED_HIGH) ? 7 : 3); |
181 | 181 | ||
182 | buf = kmalloc (maxp, SLAB_KERNEL); | 182 | buf = kmalloc (maxp, GFP_KERNEL); |
183 | if (buf) { | 183 | if (buf) { |
184 | dev->interrupt = usb_alloc_urb (0, SLAB_KERNEL); | 184 | dev->interrupt = usb_alloc_urb (0, GFP_KERNEL); |
185 | if (!dev->interrupt) { | 185 | if (!dev->interrupt) { |
186 | kfree (buf); | 186 | kfree (buf); |
187 | return -ENOMEM; | 187 | return -ENOMEM; |