From patchwork Wed Jun 29 20:42:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 102665 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 77EDCB6F18 for ; Thu, 30 Jun 2011 06:51:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757886Ab1F2Uvh (ORCPT ); Wed, 29 Jun 2011 16:51:37 -0400 Received: from swampdragon.chaosbits.net ([90.184.90.115]:18701 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757834Ab1F2Uvf (ORCPT ); Wed, 29 Jun 2011 16:51:35 -0400 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id 293DE9403D; Wed, 29 Jun 2011 22:42:25 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id 21A429403B; Wed, 29 Jun 2011 22:42:25 +0200 (CEST) Date: Wed, 29 Jun 2011 22:42:25 +0200 (CEST) From: Jesper Juhl To: Luciano Coelho cc: Johannes Berg , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , "John W. Linville" Subject: Re: [PATCH] net, wireless: Don't return uninitialized in __cfg80211_stop_sched_scan() In-Reply-To: <1309379630.1514.122.camel@cumari> Message-ID: References: <1309379244.4071.7.camel@jlt3.sipsolutions.net> <1309379630.1514.122.camel@cumari> User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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? From 606ee120df85dbd5205996878f50e51b8b7cd4a3 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Wed, 29 Jun 2011 22:49:33 +0200 Subject: [PATCH] net, wireless: Don't return uninitialized in __cfg80211_stop_sched_scan() 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 --- net/wireless/scan.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) 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)