diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-12-15 12:56:04 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-12-15 12:56:04 +0100 |
| commit | 844ec3142af3b8fd7b9aa95886015eabed80983e (patch) | |
| tree | 77ad6fe364195d9ccb8ec661be937dfcad38b3a3 /sound/soc/pxa/hx4700.c | |
| parent | 645e903528ca6cd510f9ac71a6a23de1a4d931e3 (diff) | |
| parent | 497d496598f411cb7f0690725a0e8b9029cebdb9 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/pxa/hx4700.c')
| -rw-r--r-- | sound/soc/pxa/hx4700.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c index 65c124831a0..c664e33fb6d 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) |