aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2006-12-06 23:33:17 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 11:39:24 -0500
commite94b1766097d53e6f3ccfb36c8baa562ffeda3fc (patch)
tree93fa0a8ab84976d4e89c50768ca8b8878d642a0d /drivers/usb/core
parent54e6ecb23951b195d02433a741c7f7cb0b796c78 (diff)
[PATCH] slab: remove SLAB_KERNEL
SLAB_KERNEL is an alias of GFP_KERNEL. Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r--drivers/usb/core/hub.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index 0a46acf557ac..77c05be5241a 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -2371,7 +2371,7 @@ check_highspeed (struct usb_hub *hub, struct usb_device *udev, int port1)
2371 struct usb_qualifier_descriptor *qual; 2371 struct usb_qualifier_descriptor *qual;
2372 int status; 2372 int status;
2373 2373
2374 qual = kmalloc (sizeof *qual, SLAB_KERNEL); 2374 qual = kmalloc (sizeof *qual, GFP_KERNEL);
2375 if (qual == NULL) 2375 if (qual == NULL)
2376 return; 2376 return;
2377 2377
@@ -2922,7 +2922,7 @@ static int config_descriptors_changed(struct usb_device *udev)
2922 if (len < le16_to_cpu(udev->config[index].desc.wTotalLength)) 2922 if (len < le16_to_cpu(udev->config[index].desc.wTotalLength))
2923 len = le16_to_cpu(udev->config[index].desc.wTotalLength); 2923 len = le16_to_cpu(udev->config[index].desc.wTotalLength);
2924 } 2924 }
2925 buf = kmalloc (len, SLAB_KERNEL); 2925 buf = kmalloc (len, GFP_KERNEL);
2926 if (buf == NULL) { 2926 if (buf == NULL) {
2927 dev_err(&udev->dev, "no mem to re-read configs after reset\n"); 2927 dev_err(&udev->dev, "no mem to re-read configs after reset\n");
2928 /* assume the worst */ 2928 /* assume the worst */