1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 4a20e45de3ca..96606ed10076 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -157,8 +157,9 @@ prism54_mib_init(islpci_private *priv)
  * schedule_work(), thus we can as well use sleeping semaphore
  * locking */
 void
-prism54_update_stats(islpci_private *priv)
+prism54_update_stats(struct work_struct *work)
 {
+        islpci_private *priv = container_of(work, islpci_private, stats_work);
         char *data;
         int j;
         struct obj_bss bss, *bss2;
@@ -2140,11 +2141,9 @@ prism54_wpa_bss_ie_add(islpci_private *priv, u8 *bssid,
                                          struct islpci_bss_wpa_ie, list);
                         list_del(&bss->list);
                 } else {
-                        bss = kmalloc(sizeof (*bss), GFP_ATOMIC);
-                        if (bss != NULL) {
+                        bss = kzalloc(sizeof (*bss), GFP_ATOMIC);
+                        if (bss != NULL)
                                 priv->num_bss_wpa++;
-                                memset(bss, 0, sizeof (*bss));
-                        }
                 }
                 if (bss != NULL) {
                         memcpy(bss->bssid, bssid, ETH_ALEN);
@@ -2493,9 +2492,10 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
  * interrupt context, no locks held.
  */
 void
-prism54_process_trap(void *data)
+prism54_process_trap(struct work_struct *work)
 {
-        struct islpci_mgmtframe *frame = data;
+        struct islpci_mgmtframe *frame =
+                container_of(work, struct islpci_mgmtframe, ws);
         struct net_device *ndev = frame->ndev;
         enum oid_num_t n = mgt_oidtonum(frame->header->oid);
 
@@ -2684,11 +2684,10 @@ prism2_ioctl_set_generic_element(struct net_device *ndev,
                return -EINVAL;
 
        alen = sizeof(*attach) + len;
-       attach = kmalloc(alen, GFP_KERNEL);
+       attach = kzalloc(alen, GFP_KERNEL);
        if (attach == NULL)
                return -ENOMEM;
 
-       memset(attach, 0, alen);
 #define WLAN_FC_TYPE_MGMT 0
 #define WLAN_FC_STYPE_ASSOC_REQ 0
 #define WLAN_FC_STYPE_REASSOC_REQ 2