diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2010-08-13 19:41:29 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-08-13 19:41:29 +0200 |
| commit | fb9d3d9033e275954789535579a67ee8272c9b9b (patch) | |
| tree | 57e349352d95f74da879353dd10634b97051cfd2 | |
| parent | 8a657597fccc50976f934a2734a7e23ab849b2e0 (diff) | |
| download | connman-fb9d3d9033e275954789535579a67ee8272c9b9b.tar.gz connman-fb9d3d9033e275954789535579a67ee8272c9b9b.tar.bz2 connman-fb9d3d9033e275954789535579a67ee8272c9b9b.zip | |
Disable technology when removing device
If device_disable() returns being in progress, the technology has to be
disabled. Some technologies like 3G will call remove_device directly when
unplugging a modem and without disabling the corresponding technology,
the notifier enabled refcounts will get out pf sync.
| -rw-r--r-- | src/device.c | 6 | ||||
| -rw-r--r-- | src/technology.c | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/device.c b/src/device.c index fcbfd860..1ab2c3a0 100644 --- a/src/device.c +++ b/src/device.c @@ -595,9 +595,13 @@ static void probe_driver(struct connman_element *element, gpointer user_data) static void remove_device(struct connman_device *device) { + int err; + DBG("device %p", device); - __connman_device_disable(device); + err = __connman_device_disable(device); + if (err < 0 && err == -EINPROGRESS) + __connman_technology_disable_device(device); switch (device->mode) { case CONNMAN_DEVICE_MODE_UNKNOWN: diff --git a/src/technology.c b/src/technology.c index 47ce6924..46fb23f7 100644 --- a/src/technology.c +++ b/src/technology.c @@ -525,7 +525,6 @@ int __connman_technology_remove_device(struct connman_device *device) DBG("device %p", device); type = __connman_device_get_service_type(device); - __connman_notifier_disable(type); __connman_notifier_unregister(type); technology = g_hash_table_lookup(device_table, device); |