Merge branch 'stable/for-linus-3.3' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / usb / wusbcore / security.c

diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index 371f61733f0538e9cda6d0be0d919727fc28e08a..fa810a83e8300957c72de584ab3f3fcd1e31a29a 100644 (file)
--- a/drivers/usb/wusbcore/security.c
+++ b/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;