diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2010-12-10 15:19:18 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-12-10 15:19:18 +0100 |
| commit | 2ade0c1d9d93b7642212657ef76f4a1e30233711 (patch) | |
| tree | 63bc720c0ffe5f4760cac4ed617b9870b050175e /drivers/hid/hid-egalax.c | |
| parent | HID: simplify an index check in hid_lookup_collection (diff) | |
| parent | Merge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| download | linux-dev-2ade0c1d9d93b7642212657ef76f4a1e30233711.tar.xz linux-dev-2ade0c1d9d93b7642212657ef76f4a1e30233711.zip | |
Merge branch 'master' into upstream
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 bbab6cff3518..72b1dd8d16ce 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) { hid_err(hdev, "cannot allocate eGalax data\n"); return -ENOMEM; |