aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-12-03 03:39:08 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-03 03:51:59 -0500
commit5f02ee568031fb4f0d0ac1dc9c776c34d4683c67 (patch)
tree95c650f3605f0c752d6b7be905351d867d6a58c6
parent1c08e7e3b2acc9f78bb5f478ffc7999007e309fc (diff)
ASoC: zoom2: Remove HS mux GPIO handling to avoid kernel crash due to BUG_ON()
The machine driver try to use GPIO15 of twl4030 for HS MUX which supposed to select between TWL's HSOL/R and tlv320aic3254's HPL/R. The TWL's GPIO allocated dynamically so the (OMAP_MAX_GPIO_LINES + 15) is no longer valid GPIO number causing a kernel crash due to BUG_ON() Also the current machine driver supports only TWL audio currently: there is no need to control the GPIO. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/omap/zoom2.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
index 1ff6bb9ade5..771bff27ac3 100644
--- a/sound/soc/omap/zoom2.c
+++ b/sound/soc/omap/zoom2.c
@@ -37,8 +37,6 @@
37#include "omap-mcbsp.h" 37#include "omap-mcbsp.h"
38#include "omap-pcm.h" 38#include "omap-pcm.h"
39 39
40#define ZOOM2_HEADSET_MUX_GPIO (OMAP_MAX_GPIO_LINES + 15)
41
42static int zoom2_hw_params(struct snd_pcm_substream *substream, 40static int zoom2_hw_params(struct snd_pcm_substream *substream,
43 struct snd_pcm_hw_params *params) 41 struct snd_pcm_hw_params *params)
44{ 42{
@@ -187,9 +185,6 @@ static int __init zoom2_soc_init(void)
187 if (ret) 185 if (ret)
188 goto err1; 186 goto err1;
189 187
190 BUG_ON(gpio_request(ZOOM2_HEADSET_MUX_GPIO, "hs_mux") < 0);
191 gpio_direction_output(ZOOM2_HEADSET_MUX_GPIO, 0);
192
193 return 0; 188 return 0;
194 189
195err1: 190err1:
@@ -202,8 +197,6 @@ module_init(zoom2_soc_init);
202 197
203static void __exit zoom2_soc_exit(void) 198static void __exit zoom2_soc_exit(void)
204{ 199{
205 gpio_free(ZOOM2_HEADSET_MUX_GPIO);
206
207 platform_device_unregister(zoom2_snd_device); 200 platform_device_unregister(zoom2_snd_device);
208} 201}
209module_exit(zoom2_soc_exit); 202module_exit(zoom2_soc_exit);