diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-03-30 14:50:40 -0700 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-03-30 14:50:40 -0700 |
| commit | 720e38aec0a50aa2136f01b7f3620a4e261c0406 (patch) | |
| tree | 06dbd68d467b4652f6de97c9fe1b70b02b830a71 /plugins/mm-plugin-hso.c | |
| parent | 39326f249105b7d71c63125f29e3bee2143a82d2 (diff) | |
core: move physical device checking into the manager
It turns out that the manager needs to know about the physical
device so we can prevent multiple plugins from claiming ports on
the same modem.
Diffstat (limited to 'plugins/mm-plugin-hso.c')
| -rw-r--r-- | plugins/mm-plugin-hso.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/plugins/mm-plugin-hso.c b/plugins/mm-plugin-hso.c index 8493c9c1..dc0a8fcb 100644 --- a/plugins/mm-plugin-hso.c +++ b/plugins/mm-plugin-hso.c @@ -100,7 +100,7 @@ grab_port (MMPluginBase *base, MMPluginBaseSupportsTask *task, GError **error) { - GUdevDevice *port = NULL, *physdev = NULL; + GUdevDevice *port = NULL; MMModem *modem = NULL; const char *name, *subsys, *sysfs_path; char *devfile; @@ -131,18 +131,11 @@ grab_port (MMPluginBase *base, } } - physdev = mm_plugin_base_supports_task_get_physdev (task); - g_assert (physdev); - sysfs_path = g_udev_device_get_sysfs_path (physdev); - if (!sysfs_path) { - g_set_error (error, 0, 0, "Could not get port's physical device sysfs path."); - goto out; - } - caps = mm_plugin_base_supports_task_get_probed_capabilities (task); if (!(caps & MM_PLUGIN_BASE_PORT_CAP_GSM) && strcmp (subsys, "net")) goto out; + sysfs_path = mm_plugin_base_supports_task_get_physdev_path (task); if (!existing) { modem = mm_modem_hso_new (sysfs_path, mm_plugin_base_supports_task_get_driver (task), |