From 8dcf6aa290d4f7a0536af8d63c6e1a19528c7418 Mon Sep 17 00:00:00 2001 From: Paul Reioux Date: Tue, 19 Aug 2014 14:43:30 -0400 Subject: [PATCH] Sound Control: MSM8960DT/APQ8064 ONLY: Fix logic derp mixed up rec lock and power amp lock :'( Signed-off-by: Paul Reioux Signed-off-by: flar2 --- sound/soc/codecs/sound_control_3_gpl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/sound_control_3_gpl.c b/sound/soc/codecs/sound_control_3_gpl.c index 6dd363235706..89bada770c93 100644 --- a/sound/soc/codecs/sound_control_3_gpl.c +++ b/sound/soc/codecs/sound_control_3_gpl.c @@ -135,7 +135,7 @@ int snd_hax_reg_access(unsigned int reg) case TABLA_A_RX_HPH_R_GAIN: case TABLA_A_RX_HPH_L_STATUS: case TABLA_A_RX_HPH_R_STATUS: - if (snd_rec_ctrl_locked > 1) + if (snd_ctrl_locked > 1) ret = 0; break; case TABLA_A_CDC_RX1_VOL_CTL_B2_CTL: @@ -158,7 +158,7 @@ int snd_hax_reg_access(unsigned int reg) case TABLA_A_CDC_TX8_VOL_CTL_GAIN: case TABLA_A_CDC_TX9_VOL_CTL_GAIN: case TABLA_A_CDC_TX10_VOL_CTL_GAIN: - if (snd_ctrl_locked > 0) + if (snd_rec_ctrl_locked > 0) ret = 0; break; default: