From fbecc98576ddff37d40fcae96f32ce4d87da4bad Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Tue, 29 Nov 2011 22:08:00 +0100
Subject: [PATCH] --- yaml --- r: 280799 b: refs/heads/master c:
 d5ca9db8f1dff76ef0021ed8c22c1e8fb20b4e49 h: refs/heads/master i:   280797:
 fa32b6ab9ee3ff4c3bd4d6a98777ed2592c3fb28   280795:
 ef0eeaabc11bd3a9e928f8bac255a256a54e6ef2   280791:
 db85beb00c9de8555415a1c5d99623d35eb6b59a   280783:
 ac02f1b7c9f102499e9a6ac577d8250acc3c72ef   280767:
 6fa1d3f48c41052060004a7ab40d1678286ca317 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/usb/wusbcore/security.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5f766e5499f7..a873926f0ba4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87763842b7014a7c6d9e992785e4c711c0085974
+refs/heads/master: d5ca9db8f1dff76ef0021ed8c22c1e8fb20b4e49
diff --git a/trunk/drivers/usb/wusbcore/security.c b/trunk/drivers/usb/wusbcore/security.c
index 371f61733f05..fa810a83e830 100644
--- a/trunk/drivers/usb/wusbcore/security.c
+++ b/trunk/drivers/usb/wusbcore/security.c
@@ -354,7 +354,7 @@ int wusb_dev_4way_handshake(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev,
 	struct wusb_keydvt_in keydvt_in;
 	struct wusb_keydvt_out keydvt_out;
 
-	hs = kzalloc(3*sizeof(hs[0]), GFP_KERNEL);
+	hs = kcalloc(3, sizeof(hs[0]), GFP_KERNEL);
 	if (hs == NULL) {
 		dev_err(dev, "can't allocate handshake data\n");
 		goto error_kzalloc;