diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2011-07-24 19:48:36 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2011-07-24 19:48:36 +0200 |
| commit | 235630e59c390c5067684835b5bf4a32fdb80667 (patch) | |
| tree | 540e4083a3bfa389006448ed864a8e3c1012cdcb | |
| parent | ce42d6127ce7f8d352bdf29f5ac3f98e7cdc49f3 (diff) | |
| download | ofono-235630e59c390c5067684835b5bf4a32fdb80667.tar.bz2 | |
udev: Remove voice setting flag from Huawei dongles
| -rw-r--r-- | plugins/ofono.rules | 1 | ||||
| -rw-r--r-- | plugins/udev.c | 12 |
2 files changed, 2 insertions, 11 deletions
diff --git a/plugins/ofono.rules b/plugins/ofono.rules index b97b8742..43a330df 100644 --- a/plugins/ofono.rules +++ b/plugins/ofono.rules @@ -57,7 +57,6 @@ ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1402", ENV{ID_USB_INTERFACE_NUM}=="0 ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1404", ENV{ID_USB_INTERFACE_NUM}=="00", ENV{OFONO_HUAWEI_TYPE}="Modem" ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1404", ENV{ID_USB_INTERFACE_NUM}=="02", ENV{OFONO_HUAWEI_TYPE}="Pcui" -ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1404", ENV{OFONO_HUAWEI_VOICE}="1" ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1405", ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_HUAWEI_TYPE}="Modem" ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1405", ENV{ID_USB_INTERFACE_NUM}=="00", ENV{OFONO_HUAWEI_TYPE}="Pcui" diff --git a/plugins/udev.c b/plugins/udev.c index 08c767ca..01db2f41 100644 --- a/plugins/udev.c +++ b/plugins/udev.c @@ -300,7 +300,7 @@ static void add_huawei(struct ofono_modem *modem, struct udev_device *udev_device) { struct udev_list_entry *entry; - const char *devnode, *type; + const char *devnode; int ppp, pcui; DBG("modem %p", modem); @@ -325,15 +325,7 @@ static void add_huawei(struct ofono_modem *modem, entry = udev_device_get_properties_list_entry(udev_device); while (entry) { const char *name = udev_list_entry_get_name(entry); - type = udev_list_entry_get_value(entry); - - if (g_str_equal(name, "OFONO_HUAWEI_VOICE") == TRUE) { - gboolean value = g_str_equal(type, "1"); - - ofono_modem_set_boolean(modem, "HasVoice", value); - entry = udev_list_entry_get_next(entry); - continue; - } + const char *type = udev_list_entry_get_value(entry); if (g_str_equal(name, "OFONO_HUAWEI_TYPE") != TRUE) { entry = udev_list_entry_get_next(entry); |