DivestOS/Patches/Linux_CVEs/CVE-2016-2469/ANY/0.patch

105 lines
3.0 KiB
Diff
Raw Normal View History

2017-10-29 22:14:37 -04:00
diff --git a/sound/soc/msm/Kconfig b/sound/soc/msm/Kconfig
index b47f9f6..93fbed3 100644
--- a/sound/soc/msm/Kconfig
+++ b/sound/soc/msm/Kconfig
@@ -83,35 +83,6 @@
OCMEM gets exercised for low-power
audio and voice use cases.
-config DOLBY_DAP
- bool "Enable Dolby DAP"
- depends on SND_SOC_MSM_QDSP6V2_INTF
- help
- To add support for dolby DAP post processing.
- This support is to configure the post processing parameters
- to DSP. The configuration includes sending the end point
- device, end point dependent post processing parameters and
- the various posrt processing parameters
-
-config DOLBY_DS2
- bool "Enable Dolby DS2"
- depends on SND_SOC_MSM_QDSP6V2_INTF
- help
- To add support for dolby DAP post processing.
- This support is to configure the post processing parameters
- to DSP. The configuration includes sending the end point
- device, end point dependent post processing parameters and
- the various posrt processing parameters
-
-config DTS_SRS_TM
- bool "Enable DTS SRS"
- depends on SND_SOC_MSM_QDSP6V2_INTF
- help
- To add support for DTS SRS post processing.
- This support is to configure the post processing
- parameters to DSP. The configuration includes sending
- tuning parameters of various modules.
-
config QTI_PP
bool "Enable QTI PP"
depends on SND_SOC_MSM_QDSP6V2_INTF
@@ -141,8 +112,6 @@
select SND_SOC_WCD9320
select SND_DYNAMIC_MINORS
select AUDIO_OCMEM
- select DOLBY_DAP
- select DTS_SRS_TM
select QTI_PP
help
To add support for SoC audio on MSM8974.
@@ -161,7 +130,6 @@
select SND_SOC_MSM_HDMI_CODEC_RX
select SND_DYNAMIC_MINORS
select AUDIO_OCMEM
- select DTS_SRS_TM
select QTI_PP
help
To add support for SoC audio on APQ8074.
@@ -178,8 +146,6 @@
select SND_SOC_MSM_HOSTLESS_PCM
select SND_SOC_WCD9306
select SND_DYNAMIC_MINORS
- select DOLBY_DAP
- select DTS_SRS_TM
select QTI_PP
help
To add support for SoC audio on MSM8226.
@@ -239,15 +205,11 @@
select SND_SOC_WCD9320
select SND_DYNAMIC_MINORS
select AUDIO_OCMEM
- select DOLBY_DAP
- select DTS_SRS_TM
select QTI_PP
select SND_SOC_CPE
- select DOLBY_DS2
select SND_SOC_TPA6165A2
select SND_SOC_TFA9890
select SND_SOC_FSA8500
-
help
To add support for SoC audio on APQ8084.
This will enable sound soc drivers which
@@ -264,7 +226,6 @@
select SND_SOC_WCD9306
select SND_DYNAMIC_MINORS
select AUDIO_OCMEM
- select DOLBY_DAP
help
To add support for SoC audio on MSMSAMARIUM.
diff --git a/sound/soc/msm/qdsp6v2/Makefile b/sound/soc/msm/qdsp6v2/Makefile
index bdcd0cc..24777cc 100644
--- a/sound/soc/msm/qdsp6v2/Makefile
+++ b/sound/soc/msm/qdsp6v2/Makefile
@@ -8,9 +8,6 @@
msm-pcm-routing-devdep.o
obj-$(CONFIG_SND_SOC_QDSP6V2) += snd-soc-qdsp6v2.o msm-pcm-dtmf-v2.o \
msm-dai-stub-v2.o
-obj-$(CONFIG_DOLBY_DAP) += msm-dolby-dap-config.o
-obj-$(CONFIG_DOLBY_DS2) += msm-ds2-dap-config.o
-obj-$(CONFIG_DTS_SRS_TM) += msm-dts-srs-tm-config.o
obj-$(CONFIG_QTI_PP) += msm-qti-pp-config.o
obj-y += q6adm.o q6afe.o q6asm.o q6audio-v2.o q6voice.o q6core.o audio_acdb.o \
rtac.o q6lsm.o audio_slimslave.o