From 232700bddb47054e16faa4459a2b83bf4515d39c Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 1 Dec 2008 20:00:47 +0100 Subject: [PATCH] --- yaml --- r: 120263 b: refs/heads/master c: 5220ed6b321639d68a66bad2082456c1b273f3ea h: refs/heads/master i: 120261: cbfca6cf2f8db0453d8089dce050578c76bffe83 120259: 2d1a23727562c18e9db8327e5133ec99193327ae 120255: 53d9ce84c0839e3852521accca6ac654807fd5ae v: v3 --- [refs] | 2 +- trunk/sound/soc/pxa/corgi.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 6a9d701e0696..ea51cbae7721 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bc286e2ac72e483d2b5a6dac0dafb05e9f047c8 +refs/heads/master: 5220ed6b321639d68a66bad2082456c1b273f3ea diff --git a/trunk/sound/soc/pxa/corgi.c b/trunk/sound/soc/pxa/corgi.c index 647f056a3cb3..e56bf4b6c2af 100644 --- a/trunk/sound/soc/pxa/corgi.c +++ b/trunk/sound/soc/pxa/corgi.c @@ -108,15 +108,11 @@ static int corgi_startup(struct snd_pcm_substream *substream) } /* we need to unmute the HP at shutdown as the mute burns power on corgi */ -static int corgi_shutdown(struct snd_pcm_substream *substream) +static void corgi_shutdown(struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_codec *codec = rtd->socdev->codec; - /* set = unmute headphone */ gpio_set_value(CORGI_GPIO_MUTE_L, 1); gpio_set_value(CORGI_GPIO_MUTE_R, 1); - return 0; } static int corgi_hw_params(struct snd_pcm_substream *substream,