From 458fe585a0c8fc344fe987beb81bad59eb29da34 Mon Sep 17 00:00:00 2001 From: Denis Kenzior Date: Wed, 9 Feb 2011 23:15:52 -0600 Subject: modem: Fix up previous commit --- src/modem.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/modem.c') diff --git a/src/modem.c b/src/modem.c index b195970c..18d9bbe0 100644 --- a/src/modem.c +++ b/src/modem.c @@ -759,13 +759,12 @@ static int set_powered(struct ofono_modem *modem, ofono_bool_t powered) err = driver->disable(modem); } - if (err == 0) + if (err == 0) { modem->powered = powered; - else if (err != -EINPROGRESS) + notify_powered_watches(modem); + } else if (err != -EINPROGRESS) modem->powered_pending = modem->powered; - notify_powered_watches(modem); - return err; } @@ -797,6 +796,8 @@ static gboolean set_powered_timeout(gpointer user) dbus_bool_t powered = FALSE; modem->powered = FALSE; + notify_powered_watches(modem); + ofono_dbus_signal_property_changed(conn, modem->path, OFONO_MODEM_INTERFACE, "Powered", DBUS_TYPE_BOOLEAN, @@ -1034,6 +1035,7 @@ void ofono_modem_set_powered(struct ofono_modem *modem, ofono_bool_t powered) goto out; modem->powered = powered; + notify_powered_watches(modem); if (modem->lockdown) ofono_dbus_signal_property_changed(conn, modem->path, -- cgit v1.2.3