diff options
| author | Liam Girdwood | 2014-03-06 14:56:04 +0000 |
|---|---|---|
| committer | Mark Brown | 2014-03-07 10:51:05 +0800 |
| commit | f69f41e1a2568f2ebdcf021fe216c1e9ba24cc1f (patch) | |
| tree | ba71c6c3ea92173a99acb0f415dfe5d5a4cc89d9 /sound/soc/intel | |
| parent | 9202c377390f2708dece910f2e066a6308a38abc (diff) | |
ASoC: Intel: Check Haswell IPC process_reply/notification return value.
Check the return value for error when processing replies and notifications.
The patch 22981243589c: "ASoC: Intel: Add Haswell/Broadwell IPC" from
> Feb 20, 2014, leads to the following imaginary static checker warning:
>
> sound/soc/intel/sst-haswell-ipc.c:898 hsw_irq_thread()
> warn: this is always true.
>
> sound/soc/intel/sst-haswell-ipc.c
> 895 /* Handle Immediate reply from DSP Core */
> 896 handled = hsw_process_reply(hsw, ipcx);
> ^^^^^^^^^^^^^^^^^
> Returns 1 on success/error and -EIO on error.
>
> 897
> 898 if (handled) {
> 899 /* clear DONE bit - tell DSP we have completed */
> 900 sst_dsp_shim_update_bits_unlocked(sst, SST_IPCX,
> 901 SST_IPCX_DONE, 0);
> 902
> 903 /* unmask Done interrupt */
> 904 sst_dsp_shim_update_bits_unlocked(sst, SST_IMRX,
> 905 SST_IMRX_DONE, 0);
> 906 }
>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/sst-haswell-ipc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c index 1f1576a9586a..f46bb4ddde6f 100644 --- a/sound/soc/intel/sst-haswell-ipc.c +++ b/sound/soc/intel/sst-haswell-ipc.c @@ -895,7 +895,7 @@ static irqreturn_t hsw_irq_thread(int irq, void *context) /* Handle Immediate reply from DSP Core */ handled = hsw_process_reply(hsw, ipcx); - if (handled) { + if (handled > 0) { /* clear DONE bit - tell DSP we have completed */ sst_dsp_shim_update_bits_unlocked(sst, SST_IPCX, SST_IPCX_DONE, 0); @@ -913,7 +913,7 @@ static irqreturn_t hsw_irq_thread(int irq, void *context) handled = hsw_process_notification(hsw); /* clear BUSY bit and set DONE bit - accept new messages */ - if (handled) { + if (handled > 0) { sst_dsp_shim_update_bits_unlocked(sst, SST_IPCD, SST_IPCD_BUSY | SST_IPCD_DONE, SST_IPCD_DONE); |