diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 17:40:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 17:40:04 -0800 |
| commit | 59e57c622c3502346e8f930421ebc482d639520c (patch) | |
| tree | b3e8e450fdcc07dd1ed92fac9cc712870f2ca2dc /drivers/hid/hid-egalax.c | |
| parent | 33dd94ae1ccbfb7bf0fb6c692bc3d1c4269e6177 (diff) | |
| parent | 83ed79c561da20019cb24944f535530d73b2d615 (diff) | |
| download | linux-59e57c622c3502346e8f930421ebc482d639520c.tar.gz linux-59e57c622c3502346e8f930421ebc482d639520c.tar.bz2 linux-59e57c622c3502346e8f930421ebc482d639520c.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: length resolution should be reported units/mm
HID: add support for F430 Force Feedback Wheel
HID: egalax: Use kzalloc
HID: Remove KERN_DEBUG from dbg_hid use
Manually fixed trivial conflict in drivers/hid/hid-input.c (due to
removal of KERN_DEBUG from dbg_hid use clashing with new keycode
interface switch)
Diffstat (limited to 'drivers/hid/hid-egalax.c')
| -rw-r--r-- | drivers/hid/hid-egalax.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-egalax.c b/drivers/hid/hid-egalax.c index 54b017ad258d..5a1b52e0eb85 100644 --- a/drivers/hid/hid-egalax.c +++ b/drivers/hid/hid-egalax.c @@ -221,7 +221,7 @@ static int egalax_probe(struct hid_device *hdev, const struct hid_device_id *id) struct egalax_data *td; struct hid_report *report; - td = kmalloc(sizeof(struct egalax_data), GFP_KERNEL); + td = kzalloc(sizeof(struct egalax_data), GFP_KERNEL); if (!td) { dev_err(&hdev->dev, "cannot allocate eGalax data\n"); return -ENOMEM; |