diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-24 12:57:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-24 12:57:43 +0100 |
| commit | ab4e57446ff2e0a5c154cb703595d574130dc919 (patch) | |
| tree | 2527773606a07b3f7af0bd2c0e6f692d1f340d32 /sound/soc/omap/omap3pandora.c | |
| parent | ASoC: Add initial WM8737 driver (diff) | |
| parent | ASoC: nuc900-ac97: fix a memory leak (diff) | |
| download | linux-ab4e57446ff2e0a5c154cb703595d574130dc919.tar.xz linux-ab4e57446ff2e0a5c154cb703595d574130dc919.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/omap/omap3pandora.c')
| -rw-r--r-- | sound/soc/omap/omap3pandora.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index bff9864e7615..8047c521e318 100644 --- a/sound/soc/omap/omap3pandora.c +++ b/sound/soc/omap/omap3pandora.c @@ -307,6 +307,7 @@ static int __init omap3pandora_soc_init(void) pr_err(PREFIX "Failed to get DAC regulator from %s: %ld\n", dev_name(&omap3pandora_snd_device->dev), PTR_ERR(omap3pandora_dac_reg)); + ret = PTR_ERR(omap3pandora_dac_reg); goto fail3; } |