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-longcheer.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-longcheer.c')
| -rw-r--r-- | plugins/mm-plugin-longcheer.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/plugins/mm-plugin-longcheer.c b/plugins/mm-plugin-longcheer.c index 941238cb..f1b43ecf 100644 --- a/plugins/mm-plugin-longcheer.c +++ b/plugins/mm-plugin-longcheer.c @@ -107,7 +107,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; guint32 caps; @@ -133,18 +133,11 @@ grab_port (MMPluginBase *base, && g_udev_device_get_property_as_boolean (port, "ID_MM_LONGCHEER_TAGGED")) ptype = MM_PORT_TYPE_IGNORED; - 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."); - return NULL; - } - subsys = g_udev_device_get_subsystem (port); name = g_udev_device_get_name (port); caps = mm_plugin_base_supports_task_get_probed_capabilities (task); + sysfs_path = mm_plugin_base_supports_task_get_physdev_path (task); if (!existing) { if (caps & MM_PLUGIN_BASE_PORT_CAP_GSM) { modem = mm_generic_gsm_new (sysfs_path, |