diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /drivers/usb/input/hid-tmff.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
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 */ |