Merge remote-tracking branch 'usb/usb-next'

[deliverable/linux.git] / drivers / usb / wusbcore / security.c

diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index b66faaf3e842e8338c8a6528fb260ad1ef75d16e..8c9421b69da00adb560dc7d18719591065c0f8d8 100644 (file)
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -374,10 +374,8 @@ int wusb_dev_4way_handshake(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev,
        struct wusb_keydvt_out keydvt_out;
 
        hs = kcalloc(3, sizeof(hs[0]), GFP_KERNEL);
-       if (hs == NULL) {
-               dev_err(dev, "can't allocate handshake data\n");
+       if (!hs)
                goto error_kzalloc;
-       }
 
        /* We need to turn encryption before beginning the 4way
         * hshake (WUSB1.0[.3.2.2]) */