summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-05 19:34:10 +0000
committerMark Brown <broonie@kernel.org>2015-02-05 19:34:10 +0000
commit57e6ef38a4a7e4329f185dbd382bcee1da6196a9 (patch)
tree9cb14cba73f493c15645acb1a2da4b590c368b86 /sound
parent8c617791acaf5bd59999e47e0cce94b3759f20b5 (diff)
parent97fa99a3b8aa83c8ff17ef380dd377efac373812 (diff)
downloadop-kernel-dev-57e6ef38a4a7e4329f185dbd382bcee1da6196a9.zip
op-kernel-dev-57e6ef38a4a7e4329f185dbd382bcee1da6196a9.tar.gz
Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/intel/sst-haswell-ipc.c4
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 5bf1404..8156cc1 100644
--- a/sound/soc/intel/sst-haswell-ipc.c
+++ b/sound/soc/intel/sst-haswell-ipc.c
@@ -651,11 +651,11 @@ static void hsw_notification_work(struct work_struct *work)
}
/* tell DSP that notification has been handled */
- sst_dsp_shim_update_bits_unlocked(hsw->dsp, SST_IPCD,
+ sst_dsp_shim_update_bits(hsw->dsp, SST_IPCD,
SST_IPCD_BUSY | SST_IPCD_DONE, SST_IPCD_DONE);
/* unmask busy interrupt */
- sst_dsp_shim_update_bits_unlocked(hsw->dsp, SST_IMRX, SST_IMRX_BUSY, 0);
+ sst_dsp_shim_update_bits(hsw->dsp, SST_IMRX, SST_IMRX_BUSY, 0);
}
static struct ipc_message *reply_find_msg(struct sst_hsw *hsw, u32 header)
OpenPOWER on IntegriCloud