diff --git a/[refs] b/[refs] index 3a23d88a5b6a..6bd39660c8c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3cd84fbd667d1dd01209b8c30a3a8525e8a99e63 +refs/heads/master: b7553423cde0cb49a35fabcb15f83688c01ce400 diff --git a/trunk/drivers/staging/rtl8192u/r8192U_core.c b/trunk/drivers/staging/rtl8192u/r8192U_core.c index 5981d6658320..5c132ac7647d 100644 --- a/trunk/drivers/staging/rtl8192u/r8192U_core.c +++ b/trunk/drivers/staging/rtl8192u/r8192U_core.c @@ -2808,9 +2808,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev) (priv->EarlyRxThreshold == 7 ? RCR_ONLYERLPKT:0); priv->AcmControl = 0; - priv->pFirmware = kmalloc(sizeof(rt_firmware), GFP_KERNEL); - if (priv->pFirmware) - memset(priv->pFirmware, 0, sizeof(rt_firmware)); + priv->pFirmware = kzalloc(sizeof(rt_firmware), GFP_KERNEL); /* rx related queue */ skb_queue_head_init(&priv->rx_queue);