diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2011-03-29 14:22:37 +0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2011-03-29 14:35:31 +0300 |
| commit | 46731d413c14bdd4b1fa10c06ef015af79282ac8 (patch) | |
| tree | 7423d8b29dd4bed4f1b33c109c1f2c2e696c30bf /src | |
| parent | 8a4ad6000a330878dc61b7f13dd21dea337af564 (diff) | |
| download | bluez-46731d413c14bdd4b1fa10c06ef015af79282ac8.tar.gz | |
Clean up btd_adapter_get_mode logic
There's no need to track adapter->initialized in btd_adapter_get_mode
since hciops already takes care of doing the right thing when trying to
initialize the adapter for the very first time.
Diffstat (limited to 'src')
| -rw-r--r-- | src/adapter.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/adapter.c b/src/adapter.c index 0f237973e..efe7db32e 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -2405,22 +2405,19 @@ void btd_adapter_get_mode(struct btd_adapter *adapter, uint8_t *mode, if (mode) { if (main_opts.remember_powered == FALSE) *mode = main_opts.mode; - else if (read_device_mode(address, str, sizeof(str)) < 0) - *mode = main_opts.mode; - else + else if (read_device_mode(address, str, sizeof(str)) == 0) *mode = get_mode(&adapter->bdaddr, str); + else + *mode = main_opts.mode; } if (on_mode) { - if (main_opts.remember_powered == FALSE) { - if (adapter->initialized) - *on_mode = get_mode(&adapter->bdaddr, "on"); - else - *on_mode = main_opts.mode; - } else if (read_on_mode(address, str, sizeof(str)) < 0) - *on_mode = main_opts.mode; - else + if (main_opts.remember_powered == FALSE) + *on_mode = get_mode(&adapter->bdaddr, "on"); + else if (read_on_mode(address, str, sizeof(str)) == 0) *on_mode = get_mode(&adapter->bdaddr, str); + else + *on_mode = main_opts.mode; } if (pairable) |