summaryrefslogtreecommitdiff
path: root/sound/soc/mediatek
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-04-26 11:02:03 +0100
committerMark Brown <broonie@kernel.org>2019-04-26 11:02:03 +0100
commit93f38ef6a4b62fd57076d36d1345d69f8a328ad9 (patch)
treebc7f20d968c8d1f7374927bd187d3f26f786459d /sound/soc/mediatek
parent552f2d7edd38e29073f8036191320f09b534c480 (diff)
parent780f202f2bf48aaa09282efc4dd6c39a146cc1f3 (diff)
Merge branch 'asoc-5.1' into asoc-5.2
Diffstat (limited to 'sound/soc/mediatek')
-rw-r--r--sound/soc/mediatek/common/mtk-btcvsd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/mediatek/common/mtk-btcvsd.c b/sound/soc/mediatek/common/mtk-btcvsd.c
index 9a163d7064d1..bd55c546e790 100644
--- a/sound/soc/mediatek/common/mtk-btcvsd.c
+++ b/sound/soc/mediatek/common/mtk-btcvsd.c
@@ -193,13 +193,13 @@ static const u8 table_msbc_silence[SCO_PACKET_180] = {
static void mtk_btcvsd_snd_irq_enable(struct mtk_btcvsd_snd *bt)
{
regmap_update_bits(bt->infra, bt->infra_misc_offset,
- bt->conn_bt_cvsd_mask, bt->conn_bt_cvsd_mask);
+ bt->conn_bt_cvsd_mask, 0);
}
static void mtk_btcvsd_snd_irq_disable(struct mtk_btcvsd_snd *bt)
{
regmap_update_bits(bt->infra, bt->infra_misc_offset,
- bt->conn_bt_cvsd_mask, 0);
+ bt->conn_bt_cvsd_mask, bt->conn_bt_cvsd_mask);
}
static void mtk_btcvsd_snd_set_state(struct mtk_btcvsd_snd *bt,