diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-12 09:15:27 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-12 09:15:27 +0300 |
| commit | 14d34d2dbbe2d9144a65bae1549202d1717062e2 (patch) | |
| tree | 8d8a84be09fa898bdfdf14e7783cd6b42d6bb0ed /net/wireless/sme.c | |
| parent | 3db53374405fbf7a474086ed984189f65b6f0008 (diff) | |
| parent | d434405aaab7d0ebc516b68a8fc4100922d7f5ef (diff) | |
| download | linux-14d34d2dbbe2d9144a65bae1549202d1717062e2.tar.xz | |
Merge 5.12-rc7 into usb-next
We need the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/wireless/sme.c')
| -rw-r--r-- | net/wireless/sme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 07756ca5e3b5..08a70b4f090c 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c @@ -529,7 +529,7 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, cfg80211_sme_free(wdev); } - if (WARN_ON(wdev->conn)) + if (wdev->conn) return -EINPROGRESS; wdev->conn = kzalloc(sizeof(*wdev->conn), GFP_KERNEL); |