diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-12-09 20:52:59 +0200 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-12-09 20:52:59 +0200 |
| commit | 7b1ec6c9c1ad407744d6480da1ef9d650679e831 (patch) | |
| tree | d31f3414e510917cdde91dacc9c4dea5e4d32325 /sound/soc/codecs | |
| parent | 6107aa6dc24cc8c196bb18e5b5ec81f8f1a275a8 (diff) | |
| parent | 0d6f3a76cfb07190719a68f7e73890f530427b91 (diff) | |
Merge tag 'LA.UM.8.4.r1-06200-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4 into lineage-17.1-caf-msm8998
* tag 'LA.UM.8.4.r1-06200-8x98.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4:
crypto: Fix possible stack out of bound error
ASoC: sdm660_cdc: Fix ear_pa_gain control
soc: qcom: service-locator: Free PD list after client use
cfg80211: Enhance the AKM advertizement to support per interface
msm: kgsl: Don't wait for room in context queue when context is invalidated
msm: kgsl: Don't allow re-importing memory owned by KGSL
usb: dwc3: ep0: Return from handle_status if ep0_delegate_req succeeds
scsi: ufs: Flush exception event before suspend
msm: ipa: Fix deleting the routing entries
mm-camera2:isp2: Add support for 12bit-plain16 raw format
Revert "ipv6: defrag: drop non-last frags smaller than min mtu"
usb: dwc3: ep0: Return from handle_status if ep0_delegate_req succeeds
Change-Id: Ifcb5f033b250feaa41c4916bbbec757334e3429e
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c index 66245ba438fc..eb093cf71b41 100644 --- a/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c +++ b/sound/soc/codecs/sdm660_cdc/msm-analog-cdc.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved. +/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -1631,11 +1631,11 @@ static int msm_anlg_cdc_pa_gain_get(struct snd_kcontrol *kcontrol, if (ear_pa_gain == 0x00) { ucontrol->value.integer.value[0] = 3; } else if (ear_pa_gain == 0x01) { - ucontrol->value.integer.value[1] = 2; + ucontrol->value.integer.value[0] = 2; } else if (ear_pa_gain == 0x02) { - ucontrol->value.integer.value[2] = 1; + ucontrol->value.integer.value[0] = 1; } else if (ear_pa_gain == 0x03) { - ucontrol->value.integer.value[3] = 0; + ucontrol->value.integer.value[0] = 0; } else { dev_err(codec->dev, "%s: ERROR: Unsupported Ear Gain = 0x%x\n", @@ -1657,7 +1657,6 @@ static int msm_anlg_cdc_pa_gain_get(struct snd_kcontrol *kcontrol, return -EINVAL; } } - ucontrol->value.integer.value[0] = ear_pa_gain; dev_dbg(codec->dev, "%s: ear_pa_gain = 0x%x\n", __func__, ear_pa_gain); return 0; } |