ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix rebase conflict file

pull/7304/head
Leon Lindenfelser 2018-09-26 15:54:03 -05:00
parent 7d89a02e48
commit 97d6a91eb9
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
features/cellular/framework/AT/AT_CellularDevice.cpp
View File

@ -205,7 +205,6 @@ AT_CellularInformation *AT_CellularDevice::open_information_impl(ATHandler &at)
void AT_CellularDevice::close_network() void AT_CellularDevice::close_network()
{ {
if (_network) { if (_network) {
<<<<<<< HEAD
_network_ref_count--; _network_ref_count--;
if (_network_ref_count == 0) { if (_network_ref_count == 0) {
ATHandler *atHandler = &_network->get_at_handler(); ATHandler *atHandler = &_network->get_at_handler();
@ -213,12 +212,6 @@ void AT_CellularDevice::close_network()
_network = NULL; _network = NULL;
release_at_handler(atHandler); release_at_handler(atHandler);
} }
=======
ATHandler *at_handler = &_network->get_at_handler();
delete _network;
release_at_handler(at_handler);
_network = NULL;
>>>>>>> Rebase and changes for Dragonfly nano support
} }
} }