summaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-12 12:59:06 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-12 12:59:06 +0800
commit0a105ddb35aa702d975cb902d8d2c0cde4f1f231 (patch)
tree54a33153792a400753d627652a008131403c2fc8 /sound/soc/pxa
parent43a95197581ac58081772eab3bd5f114da87f98b (diff)
parent497d496598f411cb7f0690725a0e8b9029cebdb9 (diff)
downloadtalos-op-linux-0a105ddb35aa702d975cb902d8d2c0cde4f1f231.tar.gz
talos-op-linux-0a105ddb35aa702d975cb902d8d2c0cde4f1f231.zip
Merge branch 'for-3.2' into for-3.3
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r--sound/soc/pxa/hx4700.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c
index e32afaf1ebbb..03ef9f393434 100644
--- a/sound/soc/pxa/hx4700.c
+++ b/sound/soc/pxa/hx4700.c
@@ -209,9 +209,10 @@ static int __devinit hx4700_audio_probe(struct platform_device *pdev)
snd_soc_card_hx4700.dev = &pdev->dev;
ret = snd_soc_register_card(&snd_soc_card_hx4700);
if (ret)
- return ret;
+ gpio_free_array(hx4700_audio_gpios,
+ ARRAY_SIZE(hx4700_audio_gpios));
- return 0;
+ return ret;
}
static int __devexit hx4700_audio_remove(struct platform_device *pdev)
OpenPOWER on IntegriCloud