diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-21 14:05:45 -0500 |
| commit | d04cdb64212eb5ae6a98026a97dda626e40e8e9a (patch) | |
| tree | b6a7dbb21ccfceb915844e9a330b3d3dfcaf3c5b /drivers/usb/input/hid-tmff.c | |
| parent | 2f8600dff2b140096a7df781884e918a16aa90e0 (diff) | |
| parent | ec1248e70edc5cf7b485efcc7b41e44e10f422e5 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/usb/input/hid-tmff.c')
| -rw-r--r-- | drivers/usb/input/hid-tmff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/input/hid-tmff.c b/drivers/usb/input/hid-tmff.c index 023fd5ac31c8..534425c69c0a 100644 --- a/drivers/usb/input/hid-tmff.c +++ b/drivers/usb/input/hid-tmff.c | |||
| @@ -113,11 +113,10 @@ int hid_tmff_init(struct hid_device *hid) | |||
| 113 | struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input, list); | 113 | struct hid_input *hidinput = list_entry(hid->inputs.next, struct hid_input, list); |
| 114 | struct input_dev *input_dev = hidinput->input; | 114 | struct input_dev *input_dev = hidinput->input; |
| 115 | 115 | ||
| 116 | private = kmalloc(sizeof(struct tmff_device), GFP_KERNEL); | 116 | private = kzalloc(sizeof(struct tmff_device), GFP_KERNEL); |
| 117 | if (!private) | 117 | if (!private) |
| 118 | return -ENOMEM; | 118 | return -ENOMEM; |
| 119 | 119 | ||
| 120 | memset(private, 0, sizeof(struct tmff_device)); | ||
| 121 | hid->ff_private = private; | 120 | hid->ff_private = private; |
| 122 | 121 | ||
| 123 | /* Find the report to use */ | 122 | /* Find the report to use */ |