diff options
| author | Deepak Nibade <dnibade@nvidia.com> | 2013-09-30 11:43:59 +0530 |
|---|---|---|
| committer | Harry Hong <hhong@nvidia.com> | 2014-01-12 16:53:25 -0800 |
| commit | 7c4fe0ff9a7a338ba08d3b2e790b7b94421220e6 (patch) | |
| tree | f3cc1ff692cccf45d4b1aa3869a55820d70b62e2 /drivers | |
| parent | 60ac52cc5034515b2de1e1eb9f627d0e92000f06 (diff) | |
misc: cec: cancel workqueue in suspend
- cancel the workqueue in suspend method before turning
off the clock
Bug 1360341
Change-Id: I126da686a6ba0c5eec55b67df1e9f962ce16fc48
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/280159
(cherry picked from commit 7cc6da6e41c7889f7ed8da7833d293b3b884bc0e)
Reviewed-on: http://git-master/r/353591
Reviewed-by: Harry Hong <hhong@nvidia.com>
Tested-by: Harry Hong <hhong@nvidia.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/misc/tegra-cec/tegra_cec.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/misc/tegra-cec/tegra_cec.c b/drivers/misc/tegra-cec/tegra_cec.c index e125aa189ebe..2490f3e8e9e7 100644 --- a/drivers/misc/tegra-cec/tegra_cec.c +++ b/drivers/misc/tegra-cec/tegra_cec.c @@ -1,7 +1,7 @@ /* * drivers/misc/tegra-cec/tegra_cec.c * - * Copyright (c) 2012-2013, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2012-2014, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -378,12 +378,8 @@ static int tegra_cec_suspend(struct platform_device *pdev, pm_message_t state) { struct tegra_cec *cec = platform_get_drvdata(pdev); - /* defer suspend if init is still in progress */ - if (cec->init_done == 0) { - dev_err(&pdev->dev, - "Init still in progress. Aborting suspend\n"); - return -EBUSY; - } + /* cancel the work queue */ + cancel_work_sync(&cec->work); clk_disable(cec->clk); |