diff options
| author | Andrzej Pietrasiewicz <andrzej.p@samsung.com> | 2015-07-24 09:48:40 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-07-27 10:19:50 -0500 |
| commit | 774cf72f8ad971031428f8057d2947c8780a7b8c (patch) | |
| tree | 592f655330afb07b95301b4ddb509b1911cfb251 | |
| parent | c41b7767673cb76adeb2b5fde220209f717ea13c (diff) | |
| download | op-kernel-dev-774cf72f8ad971031428f8057d2947c8780a7b8c.zip op-kernel-dev-774cf72f8ad971031428f8057d2947c8780a7b8c.tar.gz | |
usb: gadget: f_hid: actually limit the number of instances
There is a predefined maximum number of hid instances, currently 4.
A chrdev region is allocated accordingly, but with configfs the user
can create as many hid function directories as they like. To make
the number of hid instances consistent with the number of allocated minors,
the limit is enforced at directory creation time.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
| -rw-r--r-- | drivers/usb/gadget/function/f_hid.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c index f7f35a3..6df9715 100644 --- a/drivers/usb/gadget/function/f_hid.c +++ b/drivers/usb/gadget/function/f_hid.c @@ -699,6 +699,10 @@ static inline int hidg_get_minor(void) int ret; ret = ida_simple_get(&hidg_ida, 0, 0, GFP_KERNEL); + if (ret >= HIDG_MINORS) { + ida_simple_remove(&hidg_ida, ret); + ret = -ENODEV; + } return ret; } |
