summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2010-11-08 11:25:47 +0100
committerSamuel Ortiz <sameo@linux.intel.com>2010-11-08 11:25:47 +0100
commit7d7c427738f293ea0cbca628087193cc5c83cd41 (patch)
tree1c4b8ad5601b1ad2b41df2e882d64b34325acc53
parentdca0694329dd6326cdf2e38b2869413b7b0a939e (diff)
downloadconnman-7d7c427738f293ea0cbca628087193cc5c83cd41.tar.gz
connman-7d7c427738f293ea0cbca628087193cc5c83cd41.tar.bz2
connman-7d7c427738f293ea0cbca628087193cc5c83cd41.zip
device: Do not disable technology twice
The technology disabling is done by the technology plugins. Fixes BMC#8074
-rw-r--r--src/device.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/device.c b/src/device.c
index aa1ced68..01271294 100644
--- a/src/device.c
+++ b/src/device.c
@@ -299,13 +299,9 @@ 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);
- err = __connman_device_disable(device);
- if (err < 0 && err == -EINPROGRESS)
- __connman_technology_disable_device(device);
+ __connman_device_disable(device);
__connman_technology_remove_device(device);