projects
/
framework
/
connectivity
/
connman.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
device: Combine multiple if statements into one block of code
[framework/connectivity/connman.git]
/
src
/
device.c
diff --git
a/src/device.c
b/src/device.c
index
3af3680
..
d06bffd
100644
(file)
--- a/
src/device.c
+++ b/
src/device.c
@@
-247,12
+247,7
@@
int __connman_device_disable(struct connman_device *device)
}
err = device->driver->disable(device);
}
err = device->driver->disable(device);
- if (err == 0) {
- connman_device_set_powered(device, FALSE);
- goto done;
- }
-
- if (err == -EALREADY) {
+ if (err == 0 || err == -EALREADY) {
connman_device_set_powered(device, FALSE);
goto done;
}
connman_device_set_powered(device, FALSE);
goto done;
}
@@
-598,13
+593,12
@@
int connman_device_set_powered(struct connman_device *device,
type = __connman_device_get_service_type(device);
type = __connman_device_get_service_type(device);
- if (device->powered == TRUE)
- __connman_technology_enabled(type);
- else
+ if (device->powered == FALSE) {
__connman_technology_disabled(type);
__connman_technology_disabled(type);
-
- if (powered == FALSE)
return 0;
return 0;
+ }
+
+ __connman_technology_enabled(type);
connman_device_set_disconnected(device, FALSE);
device->scanning = FALSE;
connman_device_set_disconnected(device, FALSE);
device->scanning = FALSE;