Title: [3986] trunk/drivers/usb/gadget: TASK [#3221], using kmalloc/
kfree in g_zero and g_midi, otherwise it will crash when modprobe.
- Revision
- 3986
- Author
- cooloney
- Date
- 2007-12-05 02:08:49 -0600 (Wed, 05 Dec 2007)
Log Message
TASK [#3221], using kmalloc/kfree in g_zero and g_midi, otherwise it will crash when modprobe.
This change is in the mainline 2.6.23 kernel.
Diffstat
gmidi.c | 7 +++++--
zero.c | 9 +++------
2 files changed, 8 insertions(+), 8 deletions(-)
Modified Paths
Diff
Modified: trunk/drivers/usb/gadget/gmidi.c (3985 => 3986)
--- trunk/drivers/usb/gadget/gmidi.c 2007-12-05 08:01:12 UTC (rev 3985)
+++ trunk/drivers/usb/gadget/gmidi.c 2007-12-05 08:08:49 UTC (rev 3986)
@@ -1037,6 +1037,8 @@
static int gmidi_in_close(struct snd_rawmidi_substream *substream)
{
+ struct gmidi_device *dev = substream->rmidi->private_data;
+
VDBG(dev, "gmidi_in_close\n");
return 0;
}
@@ -1063,6 +1065,8 @@
static int gmidi_out_close(struct snd_rawmidi_substream *substream)
{
+ struct gmidi_device *dev = substream->rmidi->private_data;
+
VDBG(dev, "gmidi_out_close\n");
return 0;
}
@@ -1253,8 +1257,7 @@
err = -ENOMEM;
goto fail;
}
- dev->req->buf = usb_ep_alloc_buffer(gadget->ep0, USB_BUFSIZ,
- &dev->req->dma, GFP_KERNEL);
+ dev->req->buf = kmalloc(USB_BUFSIZ, GFP_KERNEL);
if (!dev->req->buf) {
err = -ENOMEM;
goto fail;
Modified: trunk/drivers/usb/gadget/zero.c (3985 => 3986)
--- trunk/drivers/usb/gadget/zero.c 2007-12-05 08:01:12 UTC (rev 3985)
+++ trunk/drivers/usb/gadget/zero.c 2007-12-05 08:08:49 UTC (rev 3986)
@@ -481,8 +481,7 @@
req = usb_ep_alloc_request (ep, GFP_ATOMIC);
if (req) {
req->length = length;
- req->buf = usb_ep_alloc_buffer (ep, length,
- &req->dma, GFP_ATOMIC);
+ req->buf = kmalloc(length, GFP_ATOMIC);
if (!req->buf) {
usb_ep_free_request (ep, req);
req = NULL;
@@ -493,8 +492,7 @@
static void free_ep_req (struct usb_ep *ep, struct usb_request *req)
{
- if (req->buf)
- usb_ep_free_buffer (ep, req->buf, req->dma, req->length);
+ kfree(req->buf);
usb_ep_free_request (ep, req);
}
@@ -1199,8 +1197,7 @@
dev->req = usb_ep_alloc_request (gadget->ep0, GFP_KERNEL);
if (!dev->req)
goto enomem;
- dev->req->buf = usb_ep_alloc_buffer (gadget->ep0, USB_BUFSIZ,
- &dev->req->dma, GFP_KERNEL);
+ dev->req->buf = kmalloc(USB_BUFSIZ, GFP_KERNEL);
if (!dev->req->buf)
goto enomem;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
