summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLance Roy <ldr709@gmail.com>2018-10-02 22:38:54 -0700
committerKalle Valo <kvalo@codeaurora.org>2018-10-05 11:35:05 +0300
commit209e957b467b8db0a875763688fd965b5afff905 (patch)
tree73c12b3a3b906456ba6c1d4a1467f6b05c7c0c13
parent3c83dd577c7f3f49420c661e693be7049bf0ca02 (diff)
downloadop-kernel-dev-209e957b467b8db0a875763688fd965b5afff905.zip
op-kernel-dev-209e957b467b8db0a875763688fd965b5afff905.tar.gz
zd1211rw: Replace spin_is_locked() with lockdep
lockdep_assert_held() is better suited to checking locking requirements, since it won't get confused when someone else holds the lock. This is also a step towards possibly removing spin_is_locked(). Signed-off-by: Lance Roy <ldr709@gmail.com> Cc: Daniel Drake <dsd@gentoo.org> Cc: Ulrich Kunitz <kune@deine-taler.de> Cc: Kalle Valo <kvalo@codeaurora.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: <linux-wireless@vger.kernel.org> Cc: <netdev@vger.kernel.org> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-rw-r--r--drivers/net/wireless/zydas/zd1211rw/zd_mac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/zydas/zd1211rw/zd_mac.c b/drivers/net/wireless/zydas/zd1211rw/zd_mac.c
index 1f6d9f3..9ccd780 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));
}
OpenPOWER on IntegriCloud