diff options
| author | Praneeth Bajjuri <praneeth@ti.com> | 2015-01-26 16:23:33 -0600 |
|---|---|---|
| committer | Praneeth Bajjuri <praneeth@ti.com> | 2015-01-26 16:23:33 -0600 |
| commit | c73470c1da26dc543452fbff16a02beb62fec938 (patch) | |
| tree | 91a0b8d6a409483ede8a7bd456ccc64f5350164e | |
| parent | d12dce283f6a121a279b86428b4de66ea8050de8 (diff) | |
| parent | 019062eaf26384ed00cfc9c3b3892368e3adf03d (diff) | |
Merge branch 'p-android-3.14' into p-ti-linux-3.14.y-android
* p-android-3.14:
input: evdev: Remove un-necessary free in evdev_release
usb: gadget: check for accessory device before disconnecting HIDs
staging: android: ashmem: add missing include
Change-Id: I71fe0ca013fcc38a08fcaa30f2aa13dc78c8b50f
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
| -rw-r--r-- | drivers/staging/android/uapi/ashmem.h | 1 | ||||
| -rw-r--r-- | drivers/usb/gadget/f_accessory.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/android/uapi/ashmem.h b/drivers/staging/android/uapi/ashmem.h index ba4743c71d6..13df42d200b 100644 --- a/drivers/staging/android/uapi/ashmem.h +++ b/drivers/staging/android/uapi/ashmem.h @@ -13,6 +13,7 @@ #define _UAPI_LINUX_ASHMEM_H #include <linux/ioctl.h> +#include <linux/types.h> #define ASHMEM_NAME_LEN 256 diff --git a/drivers/usb/gadget/f_accessory.c b/drivers/usb/gadget/f_accessory.c index a401acdceb4..0237f1e059b 100644 --- a/drivers/usb/gadget/f_accessory.c +++ b/drivers/usb/gadget/f_accessory.c @@ -951,6 +951,10 @@ kill_all_hid_devices(struct acc_dev *dev) struct list_head *entry, *temp; unsigned long flags; + /* do nothing if usb accessory device doesn't exist */ + if (!dev) + return; + spin_lock_irqsave(&dev->lock, flags); list_for_each_safe(entry, temp, &dev->hid_list) { hid = list_entry(entry, struct acc_hid_dev, list); |