sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

Refactor: modem de-registration

This commit is contained in:
Denis Kenzior 2009-12-02 15:40:45 -06:00
parent dac0ccc8a8
commit 6266e3f679
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modem.c
View File

@ -1145,11 +1145,8 @@ static void modem_unregister(struct ofono_modem *modem)
{
DBusConnection *conn = ofono_dbus_get_connection();
if (modem->driver == NULL)
return;
remove_all_atoms(modem);
modem->call_ids = 0;
if (modem->powered == TRUE)
set_powered(modem, FALSE);
__ofono_watchlist_free(modem->atom_watches);
modem->atom_watches = NULL;
@ -1178,10 +1175,7 @@ static void modem_unregister(struct ofono_modem *modem)
g_dbus_unregister_interface(conn, modem->path, OFONO_MODEM_INTERFACE);
if (modem->powered == TRUE)
set_powered(modem, FALSE);
if (modem->driver->remove)
if (modem->driver && modem->driver->remove)
modem->driver->remove(modem);
g_hash_table_destroy(modem->properties);