From patchwork Sat Jul 17 03:13:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Bizon X-Patchwork-Id: 112533 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6H3Drra015206 for ; Sat, 17 Jul 2010 03:13:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759685Ab0GQDNo (ORCPT ); Fri, 16 Jul 2010 23:13:44 -0400 Received: from smtp4-g21.free.fr ([212.27.42.4]:58990 "EHLO smtp4-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755638Ab0GQDNo (ORCPT ); Fri, 16 Jul 2010 23:13:44 -0400 Received: from bobafett.staff.proxad.net (unknown [213.228.1.121]) by smtp4-g21.free.fr (Postfix) with ESMTP id F39704C8042; Sat, 17 Jul 2010 05:13:36 +0200 (CEST) Received: from [127.0.0.1] (unknown [172.18.3.156]) by bobafett.staff.proxad.net (Postfix) with ESMTP id B9A761803C1; Sat, 17 Jul 2010 05:13:35 +0200 (CEST) Subject: [RFC] cfg80211: fix race between sysfs and cfg80211 From: Maxime Bizon Reply-To: mbizon@freebox.fr To: Johannes Berg Cc: linux-wireless@vger.kernel.org Date: Sat, 17 Jul 2010 05:13:35 +0200 Message-ID: <1279336415.1941.6.camel@kero> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sat, 17 Jul 2010 03:13:53 +0000 (UTC) diff --git a/net/wireless/core.c b/net/wireless/core.c index 6ac70c1..8952ec4 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -472,15 +472,19 @@ int wiphy_register(struct wiphy *wiphy) /* check and set up bitrates */ ieee80211_set_bitrate_flags(wiphy); + mutex_lock(&cfg80211_mutex); + res = device_add(&rdev->wiphy.dev); - if (res) + if (res) { + mutex_unlock(&cfg80211_mutex); return res; + } res = rfkill_register(rdev->rfkill); - if (res) + if (res) { + mutex_unlock(&cfg80211_mutex); goto out_rm_dev; - - mutex_lock(&cfg80211_mutex); + } /* set up regulatory info */ wiphy_update_regulatory(wiphy, NL80211_REGDOM_SET_BY_CORE);