Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rfkill: Register LED triggers before registering switch

Browse source 
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>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Michael Buesch 2007-10-28 13:07:54 +01:00 committed by David S. Miller
parent 8d8c90e3fd
commit 8a8f1c0437
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
net/rfkill/rfkill.c
View file

@ -388,19 +388,20 @@ int rfkill_register(struct rfkill *rfkill)
if (!rfkill->toggle_radio) if (!rfkill->toggle_radio)
return -EINVAL; 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); error = rfkill_add_switch(rfkill);
if (error) if (error)
return error; return error;
snprintf(dev->bus_id, sizeof(dev->bus_id),
"rfkill%ld", (long)atomic_inc_return(&rfkill_no) - 1);
error = device_add(dev); error = device_add(dev);
if (error) { if (error) {
rfkill_remove_switch(rfkill); rfkill_remove_switch(rfkill);
return error; return error;
} }
rfkill_led_trigger_register(rfkill);
return 0; return 0;
} }
@ -416,9 +417,9 @@ EXPORT_SYMBOL(rfkill_register);
*/ */
void rfkill_unregister(struct rfkill *rfkill) void rfkill_unregister(struct rfkill *rfkill)
{ {
rfkill_led_trigger_unregister(rfkill);
device_del(&rfkill->dev); device_del(&rfkill->dev);
rfkill_remove_switch(rfkill); rfkill_remove_switch(rfkill);
rfkill_led_trigger_unregister(rfkill);
put_device(&rfkill->dev); put_device(&rfkill->dev);
} }
EXPORT_SYMBOL(rfkill_unregister); EXPORT_SYMBOL(rfkill_unregister);