net, wireless: Don't return uninitialized in __cfg80211_stop_sched_scan()
Jesper Juhl [Wed, 29 Jun 2011 20:49:33 +0000 (22:49 +0200)]
If the 'driver_initiated' function argument to
__cfg80211_stop_sched_scan() is not 0 then we'll return an
uninitialized 'err' from the function.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

net/wireless/scan.c

index 7a6c676..5d23503 100644 (file)
@@ -132,7 +132,6 @@ EXPORT_SYMBOL(cfg80211_sched_scan_stopped);
 int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
                               bool driver_initiated)
 {
-       int err;
        struct net_device *dev;
 
        ASSERT_RDEV_LOCK(rdev);
@@ -143,7 +142,7 @@ int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
        dev = rdev->sched_scan_req->dev;
 
        if (!driver_initiated) {
-               err = rdev->ops->sched_scan_stop(&rdev->wiphy, dev);
+               int err = rdev->ops->sched_scan_stop(&rdev->wiphy, dev);
                if (err)
                        return err;
        }
@@ -153,7 +152,7 @@ int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev,
        kfree(rdev->sched_scan_req);
        rdev->sched_scan_req = NULL;
 
-       return err;
+       return 0;
 }
 
 static void bss_release(struct kref *ref)