summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap
diff options
context:
space:
mode:
authorMark Brown2013-03-02 08:47:55 +0100
committerMark Brown2013-03-04 06:56:23 +0100
commitdd194b48465ba9c4eef7f16a4815b7761a8172ce (patch)
tree5b3f5bdc09977e9a4566eab5ad5d24fe10424278 /sound/soc/omap
parentASoC: omap-dmic: Clean up with devm_request_and_ioremap (diff)
downloadkernel-qcow2-linux-dd194b48465ba9c4eef7f16a4815b7761a8172ce.tar.gz
kernel-qcow2-linux-dd194b48465ba9c4eef7f16a4815b7761a8172ce.tar.xz
kernel-qcow2-linux-dd194b48465ba9c4eef7f16a4815b7761a8172ce.zip
ASoC: omap: Check regulator enable for DAC on Pandora
This will probably never fail but it's better style. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Diffstat (limited to 'sound/soc/omap')
-rw-r--r--sound/soc/omap/omap3pandora.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index 805512f2555a..10ced9d2e0de 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -80,12 +80,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 {