summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2012-08-17 15:31:57 -0500
committerDan Williams <dcbw@redhat.com>2012-08-17 15:31:57 -0500
commitef4f6a2e55784fec4498d364b6181c3ca36ab7b0 (patch)
tree495e223becf16165dcd46505f8349e43a2958e0f /src
parent00651659013e868191cadf115bd5dafd5c45aae8 (diff)
downloadNetworkManager-ef4f6a2e55784fec4498d364b6181c3ca36ab7b0.tar.gz
rfkill: detect "acpi" subsystem devices as platform devices (bgo #680632)
Some rfkill drivers (sony-laptop, ideapad-laptop, classmate-laptop, etc) register their rfkill drivers under the "acpi" subsystem instead of the platform subsystem, but the semantics are the same.
Diffstat (limited to 'src')
-rw-r--r--src/nm-udev-manager.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c
index 6bd4d66ec6..792e53bfd1 100644
--- a/src/nm-udev-manager.c
+++ b/src/nm-udev-manager.c
@@ -131,7 +131,10 @@ killswitch_new (GUdevDevice *device, RfKillType rtype)
driver = "(unknown)";
ks->driver = g_strdup (driver);
- if (g_strcmp0 (subsys, "platform") == 0 || g_strcmp0 (parent_subsys, "platform") == 0)
+ if ( g_strcmp0 (subsys, "platform") == 0
+ || g_strcmp0 (parent_subsys, "platform") == 0
+ || g_strcmp0 (subsys, "acpi") == 0
+ || g_strcmp0 (parent_subsys, "acpi") == 0)
ks->platform = TRUE;
if (grandparent)