]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
iwlwifi: fix locking assertions
authorJohannes Berg <johannes.berg@intel.com>
Fri, 6 Aug 2010 14:17:53 +0000 (16:17 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 6 Aug 2010 17:53:58 +0000 (13:53 -0400)
commita24d52f390a77ce90dc8cf0cd75d27ec0a6ea3f8
tree22bd26711179036d5c417ec5fc0c56de82fe0a07
parente95b743536937a72e1560c85696b425c5d1a1c18
iwlwifi: fix locking assertions

spin_is_locked() can return zero on some (UP?)
configurations because locks don't exist, and
that causes an endless amount of warnings. Use
lockdep_assert_held() instead, which has two
advantages:
 1) it verifies the current task is holding
    the lock or mutex
 2) it compiles away completely when lockdep
    is not enabled

Cc: stable@kernel.org [2.6.34+, maybe only parts of patch]
Reported-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
drivers/net/wireless/iwlwifi/iwl-agn-tx.c
drivers/net/wireless/iwlwifi/iwl-scan.c
drivers/net/wireless/iwlwifi/iwl-sta.c