From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758379Ab2IYQUo (ORCPT ); Tue, 25 Sep 2012 12:20:44 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:57024 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757866Ab2IYQNt (ORCPT ); Tue, 25 Sep 2012 12:13:49 -0400 From: mathieu.poirier@linaro.org To: linux-kernel@vger.kernel.org, cbou@mail.ru, dwmw2@infradead.org Cc: mathieu.poirier@linaro.org Subject: [PATCH 30/57] power: ab8500: Flush & sync all works Date: Tue, 25 Sep 2012 10:12:27 -0600 Message-Id: <1348589574-25655-31-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1348589574-25655-1-git-send-email-mathieu.poirier@linaro.org> References: <1348589574-25655-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jonas Aaberg Flush and sync all workqueues at suspend to avoid that we suspend in the middle of a work. Signed-off-by: Jonas Aaberg Signed-off-by: Mathieu Poirier Reviewed-by: Marcus COOPER --- 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