Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 154385
b: refs/heads/master
c: 3cd530b
h: refs/heads/master
i:
  154383: ec7ee99
v: v3
  • Loading branch information
Corentin Chary authored and Len Brown committed Jun 26, 2009
1 parent b9f5018 commit cafae4a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: dbfa3ba90dfe353a56e107cff5bce9fb7976f06f
refs/heads/master: 3cd530b5aaffd27b231f9717730f2f6684c00bda
10 changes: 10 additions & 0 deletions trunk/drivers/platform/x86/eeepc-laptop.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ struct eeepc_hotk {
u16 *keycode_map;
struct rfkill *wlan_rfkill;
struct rfkill *bluetooth_rfkill;
struct rfkill *wwan3g_rfkill;
struct hotplug_slot *hotplug_slot;
};

Expand Down Expand Up @@ -1023,6 +1024,8 @@ static void eeepc_rfkill_exit(void)
rfkill_unregister(ehotk->wlan_rfkill);
if (ehotk->bluetooth_rfkill)
rfkill_unregister(ehotk->bluetooth_rfkill);
if (ehotk->wwan3g_rfkill)
rfkill_unregister(ehotk->wwan3g_rfkill);
if (ehotk->hotplug_slot)
pci_hp_deregister(ehotk->hotplug_slot);
}
Expand Down Expand Up @@ -1107,6 +1110,13 @@ static int eeepc_rfkill_init(struct device *dev)
if (result && result != -ENODEV)
goto exit;

result = eeepc_new_rfkill(&ehotk->wwan3g_rfkill,
"eeepc-wwan3g", dev,
RFKILL_TYPE_WWAN, CM_ASL_3G);

if (result && result != -ENODEV)
goto exit;

result = eeepc_setup_pci_hotplug();
/*
* If we get -EBUSY then something else is handling the PCI hotplug -
Expand Down

0 comments on commit cafae4a

Please sign in to comment.