From: Patrik Flykt <[email protected]>
The g_source for device_pending_reset() is going to be removed when
the callback function returns FALSE. Thus simplify the code with a
few lines.
---
src/device.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/device.c b/src/device.c
index a5b815f..d8ab1fc 100644
--- a/src/device.c
+++ b/src/device.c
@@ -221,11 +221,8 @@ static gboolean device_pending_reset(gpointer user_data)
DBG("device %p", device);
/* Power request timedout, reset power pending state. */
- if (device->pending_timeout > 0) {
- g_source_remove(device->pending_timeout);
- device->pending_timeout = 0;
- device->powered_pending = PENDING_NONE;
- }
+ device->pending_timeout = 0;
+ device->powered_pending = PENDING_NONE;
return FALSE;
}
--
1.7.2.5
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
