diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
| commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
| tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /drivers/usb/gadget/gmidi.c | |
| parent | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (diff) | |
| parent | c99767974ebd2a719d849fdeaaa1674456f5283f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
Diffstat (limited to 'drivers/usb/gadget/gmidi.c')
| -rw-r--r-- | drivers/usb/gadget/gmidi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c index 64554acad63f..31351826f2ba 100644 --- a/drivers/usb/gadget/gmidi.c +++ b/drivers/usb/gadget/gmidi.c | |||
| @@ -1236,7 +1236,7 @@ autoconf_fail: | |||
| 1236 | 1236 | ||
| 1237 | 1237 | ||
| 1238 | /* ok, we made sense of the hardware ... */ | 1238 | /* ok, we made sense of the hardware ... */ |
| 1239 | dev = kzalloc(sizeof(*dev), SLAB_KERNEL); | 1239 | dev = kzalloc(sizeof(*dev), GFP_KERNEL); |
| 1240 | if (!dev) { | 1240 | if (!dev) { |
| 1241 | return -ENOMEM; | 1241 | return -ENOMEM; |
| 1242 | } | 1242 | } |