ASoC: omap-pcm: Request the DMA channel differently when DT is involved

[karo-tx-linux.git] / sound / soc / omap / omap3pandora.c

diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index 805512f2555a0b95571a4608f6d4e35a71312c5f..cf604a2faa1809fe426baaa827a85020b70ef7a2 100644 (file)
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -34,7 +34,6 @@
 #include <linux/platform_data/asoc-ti-mcbsp.h>
 
 #include "omap-mcbsp.h"
-#include "omap-pcm.h"
 
 #define OMAP3_PANDORA_DAC_POWER_GPIO   118
 #define OMAP3_PANDORA_AMP_POWER_GPIO   14
@@ -80,12 +79,18 @@ static int omap3pandora_hw_params(struct snd_pcm_substream *substream,
 static int omap3pandora_dac_event(struct snd_soc_dapm_widget *w,
        struct snd_kcontrol *k, int event)
 {
+       int ret;
+
        /*
         * The PCM1773 DAC datasheet requires 1ms delay between switching
         * VCC power on/off and /PD pin high/low
         */
        if (SND_SOC_DAPM_EVENT_ON(event)) {
-               regulator_enable(omap3pandora_dac_reg);
+               ret = regulator_enable(omap3pandora_dac_reg);
+               if (ret) {
+                       dev_err(w->dapm->dev, "Failed to power DAC: %d\n", ret);
+                       return ret;
+               }
                mdelay(1);
                gpio_set_value(OMAP3_PANDORA_DAC_POWER_GPIO, 1);
        } else {