1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/wireless/zydas/zd1211rw/zd_mac.c b/drivers/net/wireless/zydas/zd1211rw/zd_mac.c
index b01b44a5d16e..9ccd780695f0 100644
--- a/drivers/net/wireless/zydas/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zydas/zd1211rw/zd_mac.c
@@ -235,7 +235,7 @@ void zd_mac_clear(struct zd_mac *mac)
 {
         flush_workqueue(zd_workqueue);
         zd_chip_clear(&mac->chip);
-        ZD_ASSERT(!spin_is_locked(&mac->lock));
+        lockdep_assert_held(&mac->lock);
         ZD_MEMCLEAR(mac, sizeof(struct zd_mac));
 }
 
@@ -732,7 +732,8 @@ static int zd_mac_config_beacon(struct ieee80211_hw *hw, struct sk_buff *beacon,
 
         /* Alloc memory for full beacon write at once. */
         num_cmds = 1 + zd_chip_is_zd1211b(&mac->chip) + full_len;
-        ioreqs = kmalloc(num_cmds * sizeof(struct zd_ioreq32), GFP_KERNEL);
+        ioreqs = kmalloc_array(num_cmds, sizeof(struct zd_ioreq32),
+                               GFP_KERNEL);
         if (!ioreqs) {
                 r = -ENOMEM;
                 goto out_nofree;