From 68d25b8a5706b2682ff546dda3f62f28c7d25cf7 Mon Sep 17 00:00:00 2001 From: Patrik Flykt Date: Fri, 2 Sep 2011 13:34:56 +0300 Subject: [PATCH] device: Simplify device_pending_reset() 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 file 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; } -- 2.7.4