summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2006-01-20 14:38:49 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-01-31 17:23:44 -0800
commit69396dcfa3c50a6b8d2caaccf5d1496ecd5594be (patch)
tree8ff771e3d9cfdd91d19add3369234ac8f1081438
parentc02c4bb2058587d3c012ec08268fd93fdc654ae7 (diff)
downloadblackbird-op-linux-69396dcfa3c50a6b8d2caaccf5d1496ecd5594be.tar.gz
blackbird-op-linux-69396dcfa3c50a6b8d2caaccf5d1496ecd5594be.zip
[PATCH] USB: gadget zero and dma-coherent buffers
This makes sure that the correct length is reported when freeing a dma-coherent buffer; some platforms complain if that's wrong. It also makes two parameters readonly in sysfs, as they're not safe to change while tests are running. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/gadget/zero.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c
index 2fc110d3ad5a..ae7a1c0f5748 100644
--- a/drivers/usb/gadget/zero.c
+++ b/drivers/usb/gadget/zero.c
@@ -165,8 +165,8 @@ static unsigned buflen = 4096;
static unsigned qlen = 32;
static unsigned pattern = 0;
-module_param (buflen, uint, S_IRUGO|S_IWUSR);
-module_param (qlen, uint, S_IRUGO|S_IWUSR);
+module_param (buflen, uint, S_IRUGO);
+module_param (qlen, uint, S_IRUGO);
module_param (pattern, uint, S_IRUGO|S_IWUSR);
/*
@@ -1127,8 +1127,10 @@ zero_unbind (struct usb_gadget *gadget)
DBG (dev, "unbind\n");
/* we've already been disconnected ... no i/o is active */
- if (dev->req)
+ if (dev->req) {
+ dev->req->length = USB_BUFSIZ;
free_ep_req (gadget->ep0, dev->req);
+ }
del_timer_sync (&dev->resume);
kfree (dev);
set_gadget_data (gadget, NULL);
OpenPOWER on IntegriCloud