diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 09:49:16 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 09:49:16 -0800 |
commit | e7de369050534025b33aab1033358bf47a577e4d (patch) | |
tree | fed44f469923690b98f9de2c87e6d1de76f71dc9 /drivers/usb/input/pid.c | |
parent | 87530db5ec7d519c7ba334e414307c5130ae2da8 (diff) | |
parent | eab9edd27f7ceaad6b57085817d63287bda15190 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
Diffstat (limited to 'drivers/usb/input/pid.c')
-rw-r--r-- | drivers/usb/input/pid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/input/pid.c b/drivers/usb/input/pid.c index 19e015d171a..d9d9f656b8c 100644 --- a/drivers/usb/input/pid.c +++ b/drivers/usb/input/pid.c @@ -259,7 +259,7 @@ static int hid_pid_upload_effect(struct input_dev *dev, int hid_pid_init(struct hid_device *hid) { struct hid_ff_pid *private; - struct hid_input *hidinput = list_entry(&hid->inputs, struct hid_input, list); + struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input, list); struct input_dev *input_dev = hidinput->input; private = hid->ff_private = kzalloc(sizeof(struct hid_ff_pid), GFP_KERNEL); |