* [PATCH] rfkill: Register LED triggers before registering switch
@ 2007-10-28 12:07 Michael Buesch
2007-10-28 13:05 ` Ivo van Doorn
0 siblings, 1 reply; 2+ messages in thread
From: Michael Buesch @ 2007-10-28 12:07 UTC (permalink / raw)
To: John Linville; +Cc: Ivo van Doorn, linux-wireless
Registering the switch triggers a LED event, so we must register
LED triggers before the switch.
This has a potential to fix a crash, depending on how the device
driver initializes the rfkill data structure.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Index: wireless-2.6/net/rfkill/rfkill.c
===================================================================
--- wireless-2.6.orig/net/rfkill/rfkill.c 2007-10-27 13:28:33.000000000 +0200
+++ wireless-2.6/net/rfkill/rfkill.c 2007-10-28 12:57:12.000000000 +0100
@@ -388,19 +388,20 @@ int rfkill_register(struct rfkill *rfkil
if (!rfkill->toggle_radio)
return -EINVAL;
+ snprintf(dev->bus_id, sizeof(dev->bus_id),
+ "rfkill%ld", (long)atomic_inc_return(&rfkill_no) - 1);
+
+ rfkill_led_trigger_register(rfkill);
+
error = rfkill_add_switch(rfkill);
if (error)
return error;
- snprintf(dev->bus_id, sizeof(dev->bus_id),
- "rfkill%ld", (long)atomic_inc_return(&rfkill_no) - 1);
-
error = device_add(dev);
if (error) {
rfkill_remove_switch(rfkill);
return error;
}
- rfkill_led_trigger_register(rfkill);
return 0;
}
@@ -416,9 +417,9 @@ EXPORT_SYMBOL(rfkill_register);
*/
void rfkill_unregister(struct rfkill *rfkill)
{
- rfkill_led_trigger_unregister(rfkill);
device_del(&rfkill->dev);
rfkill_remove_switch(rfkill);
+ rfkill_led_trigger_unregister(rfkill);
put_device(&rfkill->dev);
}
EXPORT_SYMBOL(rfkill_unregister);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] rfkill: Register LED triggers before registering switch
2007-10-28 12:07 [PATCH] rfkill: Register LED triggers before registering switch Michael Buesch
@ 2007-10-28 13:05 ` Ivo van Doorn
0 siblings, 0 replies; 2+ messages in thread
From: Ivo van Doorn @ 2007-10-28 13:05 UTC (permalink / raw)
To: Michael Buesch; +Cc: John Linville, linux-wireless
On Sunday 28 October 2007, Michael Buesch wrote:
> Registering the switch triggers a LED event, so we must register
> LED triggers before the switch.
> This has a potential to fix a crash, depending on how the device
> driver initializes the rfkill data structure.
>
> Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
>
> Index: wireless-2.6/net/rfkill/rfkill.c
> ===================================================================
> --- wireless-2.6.orig/net/rfkill/rfkill.c 2007-10-27 13:28:33.000000000 +0200
> +++ wireless-2.6/net/rfkill/rfkill.c 2007-10-28 12:57:12.000000000 +0100
> @@ -388,19 +388,20 @@ int rfkill_register(struct rfkill *rfkil
> if (!rfkill->toggle_radio)
> return -EINVAL;
>
> + snprintf(dev->bus_id, sizeof(dev->bus_id),
> + "rfkill%ld", (long)atomic_inc_return(&rfkill_no) - 1);
> +
> + rfkill_led_trigger_register(rfkill);
> +
> error = rfkill_add_switch(rfkill);
> if (error)
> return error;
>
> - snprintf(dev->bus_id, sizeof(dev->bus_id),
> - "rfkill%ld", (long)atomic_inc_return(&rfkill_no) - 1);
> -
> error = device_add(dev);
> if (error) {
> rfkill_remove_switch(rfkill);
> return error;
> }
> - rfkill_led_trigger_register(rfkill);
>
> return 0;
> }
> @@ -416,9 +417,9 @@ EXPORT_SYMBOL(rfkill_register);
> */
> void rfkill_unregister(struct rfkill *rfkill)
> {
> - rfkill_led_trigger_unregister(rfkill);
> device_del(&rfkill->dev);
> rfkill_remove_switch(rfkill);
> + rfkill_led_trigger_unregister(rfkill);
> put_device(&rfkill->dev);
> }
> EXPORT_SYMBOL(rfkill_unregister);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-10-28 12:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-28 12:07 [PATCH] rfkill: Register LED triggers before registering switch Michael Buesch
2007-10-28 13:05 ` Ivo van Doorn
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).