From mboxrd@z Thu Jan 1 00:00:00 1970 From: "John W. Linville" Subject: Please pull 'fixes-davem' branch of wireless-2.6 Date: Wed, 16 Jan 2008 16:26:45 -0500 Message-ID: <20080116212645.GD3164@tuxdriver.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org Return-path: Content-Disposition: inline Sender: linux-wireless-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: netdev.vger.kernel.org Dave, One more fix for rfkill in 2.6.24...note that this branch is based on 2.6.24-rc8. Thanks, John --- Individual patches available here: http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/fixes-davem/ --- The following changes since commit cbd9c883696da72b2b1f03f909dbacc04bbf8b58: Linus Torvalds (1): Linux 2.6.24-rc8 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git fixes-davem Eric Paris (1): rfkill: call rfkill_led_trigger_unregister() on error net/rfkill/rfkill.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index 4469a7b..d06d338 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c @@ -392,11 +392,14 @@ int rfkill_register(struct rfkill *rfkill) rfkill_led_trigger_register(rfkill); error = rfkill_add_switch(rfkill); - if (error) + if (error) { + rfkill_led_trigger_unregister(rfkill); return error; + } error = device_add(dev); if (error) { + rfkill_led_trigger_unregister(rfkill); rfkill_remove_switch(rfkill); return error; } -- John W. Linville linville-2XuSBdqkA4R54TAoqtyWWQ@public.gmane.org