From: Daniel Wagner Date: Mon, 25 Jul 2011 14:24:35 +0000 (+0200) Subject: device: Reorder cleanup X-Git-Tag: 2.0_alpha~1291 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba045ac4c9bf8d84d9ec2679be505bb51d098ab6;p=framework%2Fconnectivity%2Fconnman.git device: Reorder cleanup If free_network is called before the driver->disable() callback the device has been removed from the networking structure. --- diff --git a/src/device.c b/src/device.c index 39c3fc0..e5bd84d 100644 --- a/src/device.c +++ b/src/device.c @@ -271,8 +271,6 @@ int __connman_device_disable(struct connman_device *device) clear_scan_trigger(device); - g_hash_table_remove_all(device->networks); - err = device->driver->disable(device); if (err < 0 && err != -EALREADY) { if (err == -EINPROGRESS) @@ -280,6 +278,8 @@ int __connman_device_disable(struct connman_device *device) return err; } + g_hash_table_remove_all(device->networks); + device->connections = 0; device->powered_pending = FALSE;