diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-03-08 20:01:22 -0800 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-03-08 20:01:22 -0800 |
| commit | f3721a5674ef7899d9a6ef0f4c5b356720bb9833 (patch) | |
| tree | 51c469c5928b02414389e05302e8f89d9e1ef0e0 /plugins/mm-plugin-huawei.c | |
| parent | f6c514897e40e768b180963f2782ed60527ffaa6 (diff) | |
| parent | 9e231c3d4b463c32e17c7d2b1c50cea4e19d03ac (diff) | |
Merge remote branch 'origin/master' into qcdm
Diffstat (limited to 'plugins/mm-plugin-huawei.c')
| -rw-r--r-- | plugins/mm-plugin-huawei.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/plugins/mm-plugin-huawei.c b/plugins/mm-plugin-huawei.c index 51d171f6..bee7d40f 100644 --- a/plugins/mm-plugin-huawei.c +++ b/plugins/mm-plugin-huawei.c @@ -284,16 +284,9 @@ grab_port (MMPluginBase *base, caps = mm_plugin_base_supports_task_get_probed_capabilities (task); if (!existing) { if (caps & MM_PLUGIN_BASE_PORT_CAP_GSM) { - if (product == 0x1001) { - /* This modem is handled by generic GSM driver */ - modem = mm_generic_gsm_new (sysfs_path, - mm_plugin_base_supports_task_get_driver (task), - mm_plugin_get_name (MM_PLUGIN (base))); - } else { - modem = mm_modem_huawei_gsm_new (sysfs_path, - mm_plugin_base_supports_task_get_driver (task), - mm_plugin_get_name (MM_PLUGIN (base))); - } + modem = mm_modem_huawei_gsm_new (sysfs_path, + mm_plugin_base_supports_task_get_driver (task), + mm_plugin_get_name (MM_PLUGIN (base))); } else if (caps & CAP_CDMA) { modem = mm_modem_huawei_cdma_new (sysfs_path, mm_plugin_base_supports_task_get_driver (task), @@ -313,7 +306,7 @@ grab_port (MMPluginBase *base, MMPortType ptype = MM_PORT_TYPE_UNKNOWN; info = g_object_get_data (G_OBJECT (task), TAG_SUPPORTS_INFO); - if (info && info->secondary && (product != 0x1001)) + if (info && info->secondary) ptype = MM_PORT_TYPE_SECONDARY; modem = existing; |