diff options
| author | Mark Brown | 2019-04-26 12:02:03 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-04-26 12:02:03 +0200 |
| commit | 93f38ef6a4b62fd57076d36d1345d69f8a328ad9 (patch) | |
| tree | bc7f20d968c8d1f7374927bd187d3f26f786459d /sound/soc/mediatek | |
| parent | ASoC: simple-card: Read pin switches conf from devicetree (diff) | |
| parent | ASoC: mediatek: btcvsd fix irq mask (diff) | |
| download | kernel-qcow2-linux-93f38ef6a4b62fd57076d36d1345d69f8a328ad9.tar.gz kernel-qcow2-linux-93f38ef6a4b62fd57076d36d1345d69f8a328ad9.tar.xz kernel-qcow2-linux-93f38ef6a4b62fd57076d36d1345d69f8a328ad9.zip | |
Merge branch 'asoc-5.1' into asoc-5.2
Diffstat (limited to 'sound/soc/mediatek')
| -rw-r--r-- | sound/soc/mediatek/common/mtk-btcvsd.c | 4 |
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, |