HID: the `bit' in hidinput_mapping_quirks() is an out parameter
Fengguang Wu [Fri, 7 Dec 2007 08:35:14 +0000 (16:35 +0800)]
Fix a panic, by changing
hidinput_mapping_quirks(,, unsigned long *bit,)
to
hidinput_mapping_quirks(,, unsigned long **bit,)

The `bit' in this function is an out parameter.

Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

drivers/hid/hid-input-quirks.c
drivers/hid/hid-input.c
include/linux/hid.h

index fbe8b6d..4bcdc9b 100644 (file)
 #include <linux/input.h>
 #include <linux/hid.h>
 
-#define map_abs(c)      do { usage->code = c; usage->type = EV_ABS; bit = input->absbit; *max = ABS_MAX; } while (0)
-#define map_rel(c)      do { usage->code = c; usage->type = EV_REL; bit = input->relbit; *max = REL_MAX; } while (0)
-#define map_key(c)      do { usage->code = c; usage->type = EV_KEY; bit = input->keybit; *max = KEY_MAX; } while (0)
-#define map_led(c)      do { usage->code = c; usage->type = EV_LED; bit = input->ledbit; *max = LED_MAX; } while (0)
+#define map_abs(c)      do { usage->code = c; usage->type = EV_ABS; *bit = input->absbit; *max = ABS_MAX; } while (0)
+#define map_rel(c)      do { usage->code = c; usage->type = EV_REL; *bit = input->relbit; *max = REL_MAX; } while (0)
+#define map_key(c)      do { usage->code = c; usage->type = EV_KEY; *bit = input->keybit; *max = KEY_MAX; } while (0)
+#define map_led(c)      do { usage->code = c; usage->type = EV_LED; *bit = input->ledbit; *max = LED_MAX; } while (0)
 
-#define map_abs_clear(c)        do { map_abs(c); clear_bit(c, bit); } while (0)
-#define map_key_clear(c)        do { map_key(c); clear_bit(c, bit); } while (0)
+#define map_abs_clear(c)        do { map_abs(c); clear_bit(c, *bit); } while (0)
+#define map_key_clear(c)        do { map_key(c); clear_bit(c, *bit); } while (0)
 
 static int quirk_belkin_wkbd(struct hid_usage *usage, struct input_dev *input,
-                             unsigned long *bit, int *max)
+                             unsigned long **bit, int *max)
 {
        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
                return 0;
@@ -41,7 +41,7 @@ static int quirk_belkin_wkbd(struct hid_usage *usage, struct input_dev *input,
 }
 
 static int quirk_cherry_cymotion(struct hid_usage *usage, struct input_dev *input,
-                             unsigned long *bit, int *max)
+                             unsigned long **bit, int *max)
 {
        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
                return 0;
@@ -57,7 +57,7 @@ static int quirk_cherry_cymotion(struct hid_usage *usage, struct input_dev *inpu
 }
 
 static int quirk_logitech_ultrax_remote(struct hid_usage *usage, struct input_dev *input,
-                             unsigned long *bit, int *max)
+                             unsigned long **bit, int *max)
 {
        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR)
                return 0;
@@ -90,7 +90,7 @@ static int quirk_logitech_ultrax_remote(struct hid_usage *usage, struct input_de
 }
 
 static int quirk_chicony_tactical_pad(struct hid_usage *usage, struct input_dev *input,
-                             unsigned long *bit, int *max)
+                             unsigned long **bit, int *max)
 {
        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
                return 0;
@@ -115,7 +115,7 @@ static int quirk_chicony_tactical_pad(struct hid_usage *usage, struct input_dev
 }
 
 static int quirk_microsoft_ergonomy_kb(struct hid_usage *usage, struct input_dev *input,
-                             unsigned long *bit, int *max)
+                             unsigned long **bit, int *max)
 {
        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
                return 0;
@@ -138,7 +138,7 @@ static int quirk_microsoft_ergonomy_kb(struct hid_usage *usage, struct input_dev
 }
 
 static int quirk_microsoft_presenter_8k(struct hid_usage *usage, struct input_dev *input,
-                             unsigned long *bit, int *max)
+                             unsigned long **bit, int *max)
 {
        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
                return 0;
@@ -156,7 +156,7 @@ static int quirk_microsoft_presenter_8k(struct hid_usage *usage, struct input_de
 }
 
 static int quirk_petalynx_remote(struct hid_usage *usage, struct input_dev *input,
-                             unsigned long *bit, int *max)
+                             unsigned long **bit, int *max)
 {
        if (((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR) &&
                        ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER))
@@ -184,7 +184,7 @@ static int quirk_petalynx_remote(struct hid_usage *usage, struct input_dev *inpu
 }
 
 static int quirk_logitech_wireless(struct hid_usage *usage, struct input_dev *input,
-                             unsigned long *bit, int *max)
+                             unsigned long **bit, int *max)
 {
        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
                return 0;
@@ -236,7 +236,7 @@ static int quirk_logitech_wireless(struct hid_usage *usage, struct input_dev *in
 }
 
 static int quirk_cherry_genius_29e(struct hid_usage *usage, struct input_dev *input,
-                             unsigned long *bit, int *max)
+                             unsigned long **bit, int *max)
 {
        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
                return 0;
@@ -254,7 +254,7 @@ static int quirk_cherry_genius_29e(struct hid_usage *usage, struct input_dev *in
 }
 
 static int quirk_btc_8193(struct hid_usage *usage, struct input_dev *input,
-                             unsigned long *bit, int *max)
+                             unsigned long **bit, int *max)
 {
        if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
                return 0;
@@ -307,7 +307,7 @@ static int quirk_btc_8193(struct hid_usage *usage, struct input_dev *input,
 static const struct hid_input_blacklist {
        __u16 idVendor;
        __u16 idProduct;
-       int (*quirk)(struct hid_usage *, struct input_dev *, unsigned long *, int *);
+       int (*quirk)(struct hid_usage *, struct input_dev *, unsigned long **, int *);
 } hid_input_blacklist[] = {
        { VENDOR_ID_BELKIN, DEVICE_ID_BELKIN_WIRELESS_KEYBOARD, quirk_belkin_wkbd },
 
@@ -335,7 +335,7 @@ static const struct hid_input_blacklist {
 
 int hidinput_mapping_quirks(struct hid_usage *usage, 
                                   struct input_dev *input, 
-                                  unsigned long *bit, int *max)
+                                  unsigned long **bit, int *max)
 {
        struct hid_device *device = input_get_drvdata(input);
        int i = 0;
index aeb018e..5325d98 100644 (file)
@@ -382,7 +382,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
        }
 
        /* handle input mappings for quirky devices */
-       ret = hidinput_mapping_quirks(usage, input, bit, &max);
+       ret = hidinput_mapping_quirks(usage, input, &bit, &max);
        if (ret)
                goto mapped;
 
index 24f04cd..6a70b78 100644 (file)
@@ -526,7 +526,7 @@ extern void hidinput_disconnect(struct hid_device *);
 int hid_set_field(struct hid_field *, unsigned, __s32);
 int hid_input_report(struct hid_device *, int type, u8 *, int, int);
 int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field);
-int hidinput_mapping_quirks(struct hid_usage *, struct input_dev *, unsigned long *, int *);
+int hidinput_mapping_quirks(struct hid_usage *, struct input_dev *, unsigned long **, int *);
 void hidinput_event_quirks(struct hid_device *, struct hid_field *, struct hid_usage *, __s32);
 int hidinput_apple_event(struct hid_device *, struct input_dev *, struct hid_usage *, __s32);
 void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data, int interrupt);