summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Wylder <jwylder@motorola.com>2014-03-19 11:47:33 -0500
committerJames Wylder <jwylder@motorola.com>2014-03-19 15:32:36 -0500
commit76ef816aa11fb666516c5718893a9d5f86350a53 (patch)
treebe83fc369ce1c0e04b78cd9c7aa9fd939a765d27
parent44419f3b607a66d0f531d12de82b17c927988f61 (diff)
downloadolio-linux-3.10-76ef816aa11fb666516c5718893a9d5f86350a53.tar.xz
olio-linux-3.10-76ef816aa11fb666516c5718893a9d5f86350a53.zip
IKXCLOCK-468 usb: gadget: acc_hid_work check for dev
During a shutdown, the _acc_dev will be set to NULL in acc_cleanup. acc_hid_work should be stopped prior to clearing _acc_dev. Change-Id: Ie15169ebe2991383e45f8ca8de92e7c5aa275ffa Signed-off-by: James Wylder <jwylder@motorola.com>
-rw-r--r--drivers/usb/gadget/f_accessory.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_accessory.c b/drivers/usb/gadget/f_accessory.c
index 53e50b5e861..8d68c92e788 100644
--- a/drivers/usb/gadget/f_accessory.c
+++ b/drivers/usb/gadget/f_accessory.c
@@ -1199,6 +1199,7 @@ static void acc_disconnect(void)
static void acc_cleanup(void)
{
misc_deregister(&acc_device);
+ cancel_work_sync(&_acc_dev->hid_work);
kfree(_acc_dev);
_acc_dev = NULL;
}