Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

[thirdparty/kernel/stable.git] / drivers / hid / hid-core.c

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 08d310723e96c363f9f01911488864d5db66e521..210b81a56e1a111507737ac96cf5b510e416b3b6 100644 (file)
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -27,7 +27,6 @@
 #include <linux/vmalloc.h>
 #include <linux/sched.h>
 #include <linux/semaphore.h>
-#include <linux/async.h>
 
 #include <linux/hid.h>
 #include <linux/hiddev.h>
@@ -1311,10 +1310,10 @@ static u32 __extract(u8 *report, unsigned offset, int n)
 u32 hid_field_extract(const struct hid_device *hid, u8 *report,
                        unsigned offset, unsigned n)
 {
-       if (n > 256) {
-               hid_warn(hid, "hid_field_extract() called with n (%d) > 256! (%s)\n",
+       if (n > 32) {
+               hid_warn(hid, "hid_field_extract() called with n (%d) > 32! (%s)\n",
                         n, current->comm);
-               n = 256;
+               n = 32;
        }
 
        return __extract(report, offset, n);
@@ -2362,15 +2361,6 @@ int hid_add_device(struct hid_device *hdev)
        dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
                     hdev->vendor, hdev->product, atomic_inc_return(&id));
 
-       /*
-        * Try loading the module for the device before the add, so that we do
-        * not first have hid-generic binding only to have it replaced
-        * immediately afterwards with a specialized driver.
-        */
-       if (!current_is_async())
-               request_module("hid:b%04Xg%04Xv%08Xp%08X", hdev->bus,
-                              hdev->group, hdev->vendor, hdev->product);
-
        hid_debug_register(hdev, dev_name(&hdev->dev));
        ret = device_add(&hdev->dev);
        if (!ret)