From f62e7f11a7d9f89abb7b3b971417337a239e5ba6 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Wed, 23 Oct 2013 17:54:43 +0200 Subject: linux: Move poll disable to another function --- src/linux/up-device-supply.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/linux/up-device-supply.c b/src/linux/up-device-supply.c index 5ee0975..32001dc 100644 --- a/src/linux/up-device-supply.c +++ b/src/linux/up-device-supply.c @@ -1076,6 +1076,17 @@ out: return (supply->priv->poll_timer_id != 0); } +static void +up_device_supply_disable_poll (UpDevice *device) +{ + UpDeviceSupply *supply = UP_DEVICE_SUPPLY (device); + + if (supply->priv->poll_timer_id > 0) { + g_source_remove (supply->priv->poll_timer_id); + supply->priv->poll_timer_id = 0; + } +} + /** * up_device_supply_refresh: * @@ -1096,10 +1107,7 @@ up_device_supply_refresh (UpDevice *device) ret = up_device_supply_refresh_line_power (supply); break; default: - if (supply->priv->poll_timer_id > 0) { - g_source_remove (supply->priv->poll_timer_id); - supply->priv->poll_timer_id = 0; - } + up_device_supply_disable_poll (device); if (supply->priv->is_power_supply) ret = up_device_supply_refresh_battery (supply, &state); -- cgit v1.2.1