From 24892ea3dc822eed7745082df703827a7ceab4d6 Mon Sep 17 00:00:00 2001 From: Jiri Kosina Date: Fri, 9 Mar 2012 13:55:43 +0100 Subject: [PATCH] --- yaml --- r: 291670 b: refs/heads/master c: 6b1968d5b6e223237bca98879f31c5616b3b325f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-core.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 886d128e5cca..30e6953a444c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a786e83cb088f1afcd1d55e44efd4b89d78c32d1 +refs/heads/master: 6b1968d5b6e223237bca98879f31c5616b3b325f diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c index d76d85a41629..fbecdd3e7cd3 100644 --- a/trunk/drivers/hid/hid-core.c +++ b/trunk/drivers/hid/hid-core.c @@ -4,7 +4,7 @@ * Copyright (c) 1999 Andreas Gal * Copyright (c) 2000-2005 Vojtech Pavlik * Copyright (c) 2005 Michael Haboustak for Concept2, Inc - * Copyright (c) 2006-2010 Jiri Kosina + * Copyright (c) 2006-2012 Jiri Kosina */ /* @@ -50,6 +50,10 @@ module_param_named(debug, hid_debug, int, 0600); MODULE_PARM_DESC(debug, "toggle HID debugging messages"); EXPORT_SYMBOL_GPL(hid_debug); +static int hid_ignore_special_drivers = 0; +module_param_named(ignore_special_drivers, hid_ignore_special_drivers, int, 0600); +MODULE_PARM_DESC(debug, "Ignore any special drivers and handle all devices by generic driver"); + /* * Register a new report for a device. */ @@ -1678,7 +1682,7 @@ static int hid_bus_match(struct device *dev, struct device_driver *drv) return 0; /* generic wants all that don't have specialized driver */ - if (!strncmp(hdrv->name, "generic-", 8)) + if (!strncmp(hdrv->name, "generic-", 8) && !hid_ignore_special_drivers) return !hid_match_id(hdev, hid_have_special_driver); return 1;