Merge branch 'master' into develop

This commit is contained in:
Rohit Grover 2015-11-02 17:32:27 +00:00
commit 95706f05ed
2 changed files with 7 additions and 2 deletions

View File

@ -1,6 +1,6 @@
{
"name": "ble-nrf51822",
"version": "2.0.0",
"version": "2.0.1",
"description": "Nordic stack and drivers for the mbed BLE API.",
"keywords": [
"Bluetooth",

View File

@ -104,7 +104,12 @@ ble_error_t nRF5xn::shutdown(void)
return BLE_ERROR_INITIALIZATION_INCOMPLETE;
}
return (softdevice_handler_sd_disable() == NRF_SUCCESS) ? BLE_ERROR_NONE : BLE_STACK_BUSY;
if(softdevice_handler_sd_disable() != NRF_SUCCESS) {
return BLE_STACK_BUSY;
}
initialized = false;
return BLE_ERROR_NONE;
}
void