projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] slab: remove SLAB_KERNEL
[linux-block.git]
/
drivers
/
usb
/
core
/
hub.c
diff --git
a/drivers/usb/core/hub.c
b/drivers/usb/core/hub.c
index 0a46acf557ac67c1557140277e6763eb446f5960..77c05be5241abd02ac29fabec19150afda134597 100644
(file)
--- 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)
struct usb_qualifier_descriptor *qual;
int status;
struct usb_qualifier_descriptor *qual;
int status;
- qual = kmalloc (sizeof *qual,
SLAB
_KERNEL);
+ qual = kmalloc (sizeof *qual,
GFP
_KERNEL);
if (qual == NULL)
return;
if (qual == NULL)
return;
@@
-2922,7
+2922,7
@@
static int config_descriptors_changed(struct usb_device *udev)
if (len < le16_to_cpu(udev->config[index].desc.wTotalLength))
len = le16_to_cpu(udev->config[index].desc.wTotalLength);
}
if (len < le16_to_cpu(udev->config[index].desc.wTotalLength))
len = le16_to_cpu(udev->config[index].desc.wTotalLength);
}
- buf = kmalloc (len,
SLAB
_KERNEL);
+ buf = kmalloc (len,
GFP
_KERNEL);
if (buf == NULL) {
dev_err(&udev->dev, "no mem to re-read configs after reset\n");
/* assume the worst */
if (buf == NULL) {
dev_err(&udev->dev, "no mem to re-read configs after reset\n");
/* assume the worst */