From fb4c006f1761f8deb67c561af1e49155efed9060 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Wed, 29 Jun 2011 22:49:33 +0200 Subject: [PATCH] --- yaml --- r: 256182 b: refs/heads/master c: 3b4670ffe7824d1fc4db2f73101015056ecb4415 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/wireless/scan.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4ad5c0d399f0..3221c0e66185 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bff1865186c6bb97855f0c13e3850543dce9cef +refs/heads/master: 3b4670ffe7824d1fc4db2f73101015056ecb4415 diff --git a/trunk/net/wireless/scan.c b/trunk/net/wireless/scan.c index 7a6c67667d70..5d23503dd5e0 100644 --- a/trunk/net/wireless/scan.c +++ b/trunk/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)