linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "John W. Linville" <linville@tuxdriver.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: Please pull 'fixes-davem' branch of wireless-2.6
Date: Wed, 16 Jan 2008 16:26:45 -0500	[thread overview]
Message-ID: <20080116212645.GD3164@tuxdriver.com> (raw)

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@tuxdriver.com

             reply	other threads:[~2008-01-16 21:52 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-01-16 21:26 John W. Linville [this message]
2008-01-18 12:33 ` Please pull 'fixes-davem' branch of wireless-2.6 David Miller
  -- strict thread matches above, loose matches on Subject: below --
2008-01-08  5:14 John W. Linville
2008-01-08  5:21 ` David Miller
2007-12-20 15:52 John W. Linville
2007-12-20 17:39 ` Chatre, Reinette
2007-12-20 18:51   ` Chatre, Reinette
2007-12-20 19:55     ` John W. Linville
2007-12-25  6:07 ` David Miller
2007-12-17 20:54 John W. Linville
2007-12-18  6:56 ` David Miller
2007-11-30  3:31 John W. Linville
2007-11-30 12:34 ` Herbert Xu
2007-11-20 22:10 John W. Linville
2007-11-21  1:25 ` David Miller
2007-11-15  2:51 John W. Linville
2007-11-15  3:40 ` David Miller
2007-11-07  0:13 John W. Linville
2007-11-07 14:38 ` Michael Buesch
2007-11-07 18:51 ` John W. Linville
2007-11-08  0:32   ` David Miller
2007-10-26  3:10 John W. Linville
2007-10-26  4:11 ` John W. Linville
2007-10-18 22:08 John W. Linville
2007-10-19  4:57 ` David Miller
2007-10-17  2:31 John W. Linville
2007-10-17  3:29 ` Michael Wu
2007-10-17 14:53   ` John W. Linville
2007-09-15 13:15 John W. Linville
2007-08-15  0:32 John W. Linville
2007-08-15  1:33 ` David Miller
2007-08-06 20:13 John W. Linville
2007-08-08  1:08 ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080116212645.GD3164@tuxdriver.com \
    --to=linville@tuxdriver.com \
    --cc=davem@davemloft.net \
    --cc=linux-wireless@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).