Message ID | alpine.LNX.2.00.1106292241230.3747@swampdragon.chaosbits.net |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
On Wed, 2011-06-29 at 22:42 +0200, Jesper Juhl wrote: > On Wed, 29 Jun 2011, Luciano Coelho wrote: > > > On Wed, 2011-06-29 at 22:27 +0200, Johannes Berg wrote: > > > On Wed, 2011-06-29 at 22:13 +0200, Jesper Juhl wrote: > > > > If the 'driver_initiated' function argument to > > > > __cfg80211_stop_sched_scan() is not 0 then we'll return an > > > > uninitialized 'ret' from the function. > > > > > > 'err'. I also dislike the initialisation, can we just replace the > > > "return err;" at the end of the function with "return 0;" instead? > > > > Luckily we were never using the return value when passing > > driver_initiate =- false. > > > > And I agree with you, there's no use to return err at the end. Better > > to simply return 0. > > > Ok, so how about this? Fine with me. johannes -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 7a6c676..5d23503 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -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)