brcmfmac: p2p: Fix recently introduced deadlock issue
authorHans de Goede <hdegoede@redhat.com>
Sat, 13 Mar 2021 14:36:35 +0000 (15:36 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 23 Mar 2021 09:37:15 +0000 (11:37 +0200)
commitbd83a2fc05ed323d7ae38443a6d2e253ef1c4237
tree48e982bd4ccbd50b06c78888157f268c496cc1bf
parent8f6a70fd71a3d7a6b120f83681263fc370eb52ba
brcmfmac: p2p: Fix recently introduced deadlock issue

Commit a05829a7222e ("cfg80211: avoid holding the RTNL when calling the
driver") replaced the rtnl_lock parameter passed to various brcmf
functions with just lock, because since that commit it is not just
about the rtnl_lock but also about the wiphy_lock .

During this search/replace the "if (!rtnl_locked)" check in brcmfmac/p2p.c
was accidentally replaced with "if (locked)", dropping the inversion of
the check. This causes the code to now call rtnl_lock() while already
holding the lock, causing a deadlock.

Add back the "!" to the if-condition to fix this.

Cc: Johannes Berg <johannes.berg@intel.com>
Fixes: a05829a7222e ("cfg80211: avoid holding the RTNL when calling the driver")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20210313143635.109154-1-hdegoede@redhat.com
drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c