diff options
| author | Dan Williams <dcbw@redhat.com> | 2009-06-29 09:00:25 -0400 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2009-06-29 09:00:25 -0400 |
| commit | c6d0174b41524c84ba756472e47c810239be0886 (patch) | |
| tree | f58d394a073d78c04949ecce3cdba795e178624c /plugins/mm-plugin-hso.c | |
| parent | 504b4991cd3aecd358d92a9c39233e6ca09036fa (diff) | |
hso: fix grab of netdev port
Diffstat (limited to 'plugins/mm-plugin-hso.c')
| -rw-r--r-- | plugins/mm-plugin-hso.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/plugins/mm-plugin-hso.c b/plugins/mm-plugin-hso.c index edcabab2..ca6bfae0 100644 --- a/plugins/mm-plugin-hso.c +++ b/plugins/mm-plugin-hso.c @@ -133,13 +133,13 @@ grab_port (MMPluginBase *base, } caps = mm_plugin_base_supports_task_get_probed_capabilities (task); - if (!existing) { - if (caps & MM_PLUGIN_BASE_PORT_CAP_GSM) { - modem = mm_modem_hso_new (sysfs_path, - mm_plugin_base_supports_task_get_driver (task), - mm_plugin_get_name (MM_PLUGIN (base))); - } + if (!(caps & MM_PLUGIN_BASE_PORT_CAP_GSM) && strcmp (subsys, "net")) + goto out; + if (!existing) { + modem = mm_modem_hso_new (sysfs_path, + mm_plugin_base_supports_task_get_driver (task), + mm_plugin_get_name (MM_PLUGIN (base))); if (modem) { if (!mm_modem_grab_port (modem, subsys, name, NULL, error)) { g_object_unref (modem); @@ -147,11 +147,9 @@ grab_port (MMPluginBase *base, } } } else { - if (caps & MM_PLUGIN_BASE_PORT_CAP_GSM) { - modem = existing; - if (!mm_modem_grab_port (modem, subsys, name, NULL, error)) - return NULL; - } + modem = existing; + if (!mm_modem_grab_port (modem, subsys, name, NULL, error)) + return NULL; } out: |