[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1348589574-25655-31-git-send-email-mathieu.poirier@linaro.org>
Date: Tue, 25 Sep 2012 10:12:27 -0600
From: mathieu.poirier@...aro.org
To: linux-kernel@...r.kernel.org, cbou@...l.ru, dwmw2@...radead.org
Cc: mathieu.poirier@...aro.org
Subject: [PATCH 30/57] power: ab8500: Flush & sync all works
From: Jonas Aaberg <jonas.aberg@...ricsson.com>
Flush and sync all workqueues at suspend to avoid
that we suspend in the middle of a work.
Signed-off-by: Jonas Aaberg <jonas.aberg@...ricsson.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@...aro.org>
Reviewed-by: Marcus COOPER <marcus.xm.cooper@...ricsson.com>
---
drivers/power/ab8500_charger.c | 11 +++++++++++
drivers/power/ab8500_fg.c | 5 +++++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index ee5ad7b..071c7c2 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -2862,6 +2862,17 @@ static int ab8500_charger_suspend(struct platform_device *pdev,
if (delayed_work_pending(&di->check_hw_failure_work))
cancel_delayed_work(&di->check_hw_failure_work);
+ flush_delayed_work_sync(&di->attach_work);
+ flush_delayed_work_sync(&di->usb_charger_attached_work);
+ flush_delayed_work_sync(&di->ac_charger_attached_work);
+ flush_delayed_work_sync(&di->check_usbchgnotok_work);
+ flush_delayed_work_sync(&di->check_vbat_work);
+ flush_delayed_work_sync(&di->kick_wd_work);
+
+ flush_work_sync(&di->usb_link_status_work);
+ flush_work_sync(&di->ac_work);
+ flush_work_sync(&di->detect_usb_type_work);
+
return 0;
}
#else
diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c
index e7a0e1f..0e71e7e 100644
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@ -2626,6 +2626,11 @@ static int ab8500_fg_suspend(struct platform_device *pdev,
struct ab8500_fg *di = platform_get_drvdata(pdev);
flush_delayed_work_sync(&di->fg_periodic_work);
+ flush_work_sync(&di->fg_work);
+ flush_work_sync(&di->fg_acc_cur_work);
+ flush_delayed_work_sync(&di->fg_reinit_work);
+ flush_delayed_work_sync(&di->fg_low_bat_work);
+ flush_delayed_work_sync(&di->fg_check_hw_failure_work);
/*
* If the FG is enabled we will disable it before going to suspend
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists