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

[pandora-kernel.git] / drivers / staging / rtl8192u / r8192U_core.c

diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index 68ebb02..2bede27 100644 (file)
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -2216,7 +2216,8 @@ short rtl8192_usb_initendpoints(struct net_device *dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
 
-       priv->rx_urb = (struct urb**) kmalloc (sizeof(struct urb*) * (MAX_RX_URB+1), GFP_KERNEL);
+       priv->rx_urb = kmalloc(sizeof(struct urb *) * (MAX_RX_URB+1),
+                               GFP_KERNEL);
 
 #ifndef JACKSON_NEW_RX
        for(i=0;i<(MAX_RX_URB+1);i++){
@@ -2250,12 +2251,11 @@ short rtl8192_usb_initendpoints(struct net_device *dev)
 #endif
 
        memset(priv->rx_urb, 0, sizeof(struct urb*) * MAX_RX_URB);
-       priv->pp_rxskb = (struct sk_buff **)kmalloc(sizeof(struct sk_buff *) * MAX_RX_URB, GFP_KERNEL);
+       priv->pp_rxskb = kcalloc(MAX_RX_URB, sizeof(struct sk_buff *),
+                                GFP_KERNEL);
        if (priv->pp_rxskb == NULL)
                goto destroy;
 
-       memset(priv->pp_rxskb, 0, sizeof(struct sk_buff*) * MAX_RX_URB);
-
        goto _middle;
 
 
@@ -2839,7 +2839,7 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
                (priv->EarlyRxThreshold == 7 ? RCR_ONLYERLPKT:0);
 
        priv->AcmControl = 0;
-       priv->pFirmware = (rt_firmware*)kmalloc(sizeof(rt_firmware), GFP_KERNEL);
+       priv->pFirmware = kmalloc(sizeof(rt_firmware), GFP_KERNEL);
        if (priv->pFirmware)
        memset(priv->pFirmware, 0, sizeof(rt_firmware));
 
@@ -4415,7 +4415,7 @@ int rtl8192_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
             goto out;
        }
 
-     ipw = (struct ieee_param *)kmalloc(p->length, GFP_KERNEL);
+     ipw = kmalloc(p->length, GFP_KERNEL);
      if (ipw == NULL){
             ret = -ENOMEM;
             goto out;