nl80211: Simplify error handling path in 'nl80211_trigger_scan()'

Re-write the end of 'nl80211_trigger_scan()' with a more standard, easy to
understand and future proof version.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/20200712173551.274448-1-christophe.jaillet@wanadoo.fr
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 96b94a90062518ef4ce18597409ad8e17f548dcc..6fdf818f66cf0499109e7d473180a9bb479a60ef 100644 (file)
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -7993,15 +7993,18 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
        rdev->scan_req = request;
        err = rdev_scan(rdev, request);
 
-       if (!err) {
-               nl80211_send_scan_start(rdev, wdev);
-               if (wdev->netdev)
-                       dev_hold(wdev->netdev);
-       } else {
+       if (err)
+               goto out_free;
+
+       nl80211_send_scan_start(rdev, wdev);
+       if (wdev->netdev)
+               dev_hold(wdev->netdev);
+
+       return 0;
+
  out_free:
-               rdev->scan_req = NULL;
-               kfree(request);
-       }
+       rdev->scan_req = NULL;
+       kfree(request);
 
        return err;
 }