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

modem: Simplify the modem lockdown modification

This commit is contained in:
Marcel Holtmann 2011-01-26 09:51:41 +01:00
parent 8637e31d1d
commit ed99980cd3
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modem.c
View File

@ -796,6 +796,7 @@ static DBusMessage *set_property_lockdown(struct ofono_modem *modem,
{
DBusConnection *conn = ofono_dbus_get_connection();
ofono_bool_t lockdown;
dbus_bool_t powered;
const char *caller;
int err;
@ -815,8 +816,10 @@ static DBusMessage *set_property_lockdown(struct ofono_modem *modem,
if (modem->lockdown == lockdown)
return dbus_message_new_method_return(msg);
if (lockdown) {
dbus_bool_t powered;
if (lockdown == FALSE) {
lockdown_remove(modem);
goto done;
}
modem->lock_owner = g_strdup(caller);
@ -833,7 +836,7 @@ static DBusMessage *set_property_lockdown(struct ofono_modem *modem,
modem->lockdown = lockdown;
if (!modem->powered)
if (modem->powered == FALSE)
goto done;
err = set_powered(modem, FALSE);
@ -854,8 +857,6 @@ static DBusMessage *set_property_lockdown(struct ofono_modem *modem,
OFONO_MODEM_INTERFACE,
"Powered", DBUS_TYPE_BOOLEAN,
&powered);
} else
lockdown_remove(modem);
done:
g_dbus_send_reply(conn, msg, DBUS_TYPE_INVALID);