From patchwork Wed Jun 29 20:13:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 102660 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 6E77AB6F5D for ; Thu, 30 Jun 2011 06:23:09 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754242Ab1F2UWo (ORCPT ); Wed, 29 Jun 2011 16:22:44 -0400 Received: from swampdragon.chaosbits.net ([90.184.90.115]:18337 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752849Ab1F2UWm (ORCPT ); Wed, 29 Jun 2011 16:22:42 -0400 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id 2481E9403D; Wed, 29 Jun 2011 22:13:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id 0710C9403B; Wed, 29 Jun 2011 22:13:31 +0200 (CEST) Date: Wed, 29 Jun 2011 22:13:31 +0200 (CEST) From: Jesper Juhl To: linux-wireless@vger.kernel.org cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "David S. Miller" , "John W. Linville" , Johannes Berg Subject: [PATCH] net, wireless: Don't return uninitialized in __cfg80211_stop_sched_scan() Message-ID: 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 If the 'driver_initiated' function argument to __cfg80211_stop_sched_scan() is not 0 then we'll return an uninitialized 'ret' from the function. Signed-off-by: Jesper Juhl --- net/wireless/scan.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 7a6c676..7940fa5 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c @@ -132,7 +132,7 @@ EXPORT_SYMBOL(cfg80211_sched_scan_stopped); int __cfg80211_stop_sched_scan(struct cfg80211_registered_device *rdev, bool driver_initiated) { - int err; + int err = 0; struct net_device *dev; ASSERT_RDEV_LOCK(rdev);