From: Jiri Kosina <jkosina@suse.cz>
Date: Fri, 10 Dec 2010 14:19:18 +0000 (+0100)
Subject: Merge branch 'master' into upstream
X-Git-Tag: v2.6.38-rc1~442^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2ade0c1d9d93b7642212657ef76f4a1e30233711;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'master' into upstream
---

2ade0c1d9d93b7642212657ef76f4a1e30233711
diff --cc drivers/hid/hid-egalax.c
index bbab6cf,5a1b52e..72b1dd8
--- a/drivers/hid/hid-egalax.c
+++ b/drivers/hid/hid-egalax.c
@@@ -221,9 -221,9 +221,9 @@@ static int egalax_probe(struct hid_devi
  	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");
 +		hid_err(hdev, "cannot allocate eGalax data\n");
  		return -ENOMEM;
  	}
  	hid_set_drvdata(hdev, td);