diff options
| author | Iliyan Malchev <malchev@google.com> | 2010-11-05 13:03:35 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:36:38 -0800 |
| commit | 0fd7ee1e22cff5c30ea134d3ebf764ecea2974a7 (patch) | |
| tree | 1d752641fda5b3a8b7df4edbad53689ddb5862a3 /arch/arm/mach-tegra/tegra_spdif_audio.c | |
| parent | 9c0fc647f12d6fcd870232c9cf07c8bb24042b67 (diff) | |
[ARM] tegra_i2s/spdif_audio: move allow_suspend to a work queue
Since pm_qos_update_request() may block, we need to make sure that
allow_suspend is always called in process context.
Signed-off-by: Iliyan Malchev <malchev@google.com>
Diffstat (limited to 'arch/arm/mach-tegra/tegra_spdif_audio.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra_spdif_audio.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/tegra_spdif_audio.c b/arch/arm/mach-tegra/tegra_spdif_audio.c index 3764edfdf869..1c22e4537876 100644 --- a/arch/arm/mach-tegra/tegra_spdif_audio.c +++ b/arch/arm/mach-tegra/tegra_spdif_audio.c @@ -46,6 +46,7 @@ #include <linux/pm_qos_params.h> #include <linux/delay.h> #include <linux/tegra_audio.h> +#include <linux/workqueue.h> #include <mach/dma.h> #include <mach/iomap.h> @@ -88,6 +89,7 @@ struct audio_stream { struct tegra_dma_req dma_req; struct pm_qos_request_list pm_qos; + struct work_struct allow_suspend_work; }; struct spdif_pio_stats { @@ -162,15 +164,24 @@ static inline struct audio_driver_state *ads_from_out( static inline void prevent_suspend(struct audio_stream *as) { pr_debug("%s\n", __func__); + cancel_work_sync(&as->allow_suspend_work); pm_qos_update_request(&as->pm_qos, 0); } -static inline void allow_suspend(struct audio_stream *as) +static void allow_suspend_worker(struct work_struct *w) { + struct audio_stream *as = container_of(w, + struct audio_stream, allow_suspend_work); + pr_debug("%s\n", __func__); pm_qos_update_request(&as->pm_qos, PM_QOS_DEFAULT_VALUE); } +static inline void allow_suspend(struct audio_stream *as) +{ + schedule_work(&as->allow_suspend_work); +} + #define I2S_I2S_FIFO_TX_BUSY I2S_I2S_STATUS_FIFO1_BSY #define I2S_I2S_FIFO_TX_QS I2S_I2S_STATUS_QS_FIFO1 #define I2S_I2S_FIFO_TX_ERR I2S_I2S_STATUS_FIFO1_ERR @@ -1337,6 +1348,7 @@ static int tegra_spdif_probe(struct platform_device *pdev) if (rc < 0) return rc; + INIT_WORK(&state->out.allow_suspend_work, allow_suspend_worker); pm_qos_add_request(&state->out.pm_qos, PM_QOS_CPU_DMA_LATENCY, PM_QOS_DEFAULT_VALUE); |