| From 19872d20c890073c5207d9e02bb8f14d451a11eb Mon Sep 17 00:00:00 2001 |
| From: David Herrmann <dh.herrmann@gmail.com> |
| Date: Mon, 9 Sep 2013 18:33:54 +0200 |
| Subject: HID: uhid: allocate static minor |
| |
| From: David Herrmann <dh.herrmann@gmail.com> |
| |
| commit 19872d20c890073c5207d9e02bb8f14d451a11eb upstream. |
| |
| udev has this nice feature of creating "dead" /dev/<node> device-nodes if |
| it finds a devnode:<node> modalias. Once the node is accessed, the kernel |
| automatically loads the module that provides the node. However, this |
| requires udev to know the major:minor code to use for the node. This |
| feature was introduced by: |
| |
| commit 578454ff7eab61d13a26b568f99a89a2c9edc881 |
| Author: Kay Sievers <kay.sievers@vrfy.org> |
| Date: Thu May 20 18:07:20 2010 +0200 |
| |
| driver core: add devname module aliases to allow module on-demand auto-loading |
| |
| However, uhid uses dynamic minor numbers so this doesn't actually work. We |
| need to load uhid to know which minor it's going to use. |
| |
| Hence, allocate a static minor (just like uinput does) and we're good |
| to go. |
| |
| Reported-by: Tom Gundersen <teg@jklm.no> |
| Signed-off-by: David Herrmann <dh.herrmann@gmail.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/hid/uhid.c | 3 ++- |
| include/linux/miscdevice.h | 1 + |
| 2 files changed, 3 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/hid/uhid.c |
| +++ b/drivers/hid/uhid.c |
| @@ -640,7 +640,7 @@ static const struct file_operations uhid |
| |
| static struct miscdevice uhid_misc = { |
| .fops = &uhid_fops, |
| - .minor = MISC_DYNAMIC_MINOR, |
| + .minor = UHID_MINOR, |
| .name = UHID_NAME, |
| }; |
| |
| @@ -659,4 +659,5 @@ module_exit(uhid_exit); |
| MODULE_LICENSE("GPL"); |
| MODULE_AUTHOR("David Herrmann <dh.herrmann@gmail.com>"); |
| MODULE_DESCRIPTION("User-space I/O driver support for HID subsystem"); |
| +MODULE_ALIAS_MISCDEV(UHID_MINOR); |
| MODULE_ALIAS("devname:" UHID_NAME); |
| --- a/include/linux/miscdevice.h |
| +++ b/include/linux/miscdevice.h |
| @@ -45,6 +45,7 @@ |
| #define MAPPER_CTRL_MINOR 236 |
| #define LOOP_CTRL_MINOR 237 |
| #define VHOST_NET_MINOR 238 |
| +#define UHID_MINOR 239 |
| #define MISC_DYNAMIC_MINOR 255 |
| |
| struct device; |