]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
ASoC: omap: rx51: Use gpio_set_value_cansleep for speaker amp control
authorJarkko Nikula <jhnikula@gmail.com>
Mon, 23 Aug 2010 07:36:41 +0000 (10:36 +0300)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Mon, 23 Aug 2010 11:03:09 +0000 (12:03 +0100)
Speaker amplifier is controlled by TWL4030 GPIO which may sleep. Therefore
use gpio_set_value_cansleep to get rid of runtime warning that is introduced
after the commit 9c4ba94 and to get a stack trace if ever executing this
code in atomic context.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
sound/soc/omap/rx51.c

index d1d8098923ce103dec46748d27c6d66fb613329c..04b5723bf89b5b4f289a6339e97f661fbd9dbccf 100644 (file)
@@ -146,9 +146,9 @@ static int rx51_spk_event(struct snd_soc_dapm_widget *w,
                          struct snd_kcontrol *k, int event)
 {
        if (SND_SOC_DAPM_EVENT_ON(event))
-               gpio_set_value(RX51_SPEAKER_AMP_TWL_GPIO, 1);
+               gpio_set_value_cansleep(RX51_SPEAKER_AMP_TWL_GPIO, 1);
        else
-               gpio_set_value(RX51_SPEAKER_AMP_TWL_GPIO, 0);
+               gpio_set_value_cansleep(RX51_SPEAKER_AMP_TWL_GPIO, 0);
 
        return 0;
 }