diff options
| author | Mark Brown <broonie@kernel.org> | 2018-01-12 12:28:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-01-12 12:28:47 +0000 |
| commit | 3e4555ab2f5a667a4a79f03e81a34cd8b5b3eb0c (patch) | |
| tree | c1cd96f70fbec0677537931d812f3190a0275e67 /sound/soc/intel/common/sst-dsp.c | |
| parent | 7c310f167a8e04f42d920912b6df39868fcfd742 (diff) | |
| parent | 987da3fe175933c28aab2293505c3597052ff0e2 (diff) | |
Merge remote-tracking branch 'asoc/topic/intel' into asoc-next
Diffstat (limited to 'sound/soc/intel/common/sst-dsp.c')
| -rw-r--r-- | sound/soc/intel/common/sst-dsp.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/intel/common/sst-dsp.c b/sound/soc/intel/common/sst-dsp.c index 11c0805393ff..fd82f4b1d4a0 100644 --- a/sound/soc/intel/common/sst-dsp.c +++ b/sound/soc/intel/common/sst-dsp.c @@ -269,7 +269,7 @@ int sst_dsp_register_poll(struct sst_dsp *ctx, u32 offset, u32 mask, */ timeout = jiffies + msecs_to_jiffies(time); - while (((sst_dsp_shim_read_unlocked(ctx, offset) & mask) != target) + while ((((reg = sst_dsp_shim_read_unlocked(ctx, offset)) & mask) != target) && time_before(jiffies, timeout)) { k++; if (k > 10) @@ -278,8 +278,6 @@ int sst_dsp_register_poll(struct sst_dsp *ctx, u32 offset, u32 mask, usleep_range(s, 2*s); } - reg = sst_dsp_shim_read_unlocked(ctx, offset); - if ((reg & mask) == target) { dev_dbg(ctx->dev, "FW Poll Status: reg=%#x %s successful\n", reg, operation); |