diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-31 21:07:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-31 21:07:22 +0100 |
| commit | 0d054318d5349a60922b30f2cf572b8b613712f7 (patch) | |
| tree | fdd43f5db3cc5c74f076344051f1ff8ea3fe98b1 | |
| parent | d2ee88d0aaacac664aff6ca5fc0bd7705d8f2414 (diff) | |
| parent | 610d80eaa987e7b1a2d07ee800c9722e227a3b47 (diff) | |
| download | linux-0d054318d5349a60922b30f2cf572b8b613712f7.tar.gz linux-0d054318d5349a60922b30f2cf572b8b613712f7.tar.bz2 linux-0d054318d5349a60922b30f2cf572b8b613712f7.zip | |
Merge remote-tracking branch 'asoc/fix/blackfin' into asoc-linus
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ac97.c | 5 | ||||
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ac97.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/blackfin/bf5xx-ac97.c b/sound/soc/blackfin/bf5xx-ac97.c index efb1daecd0dd..e82eb373a731 100644 --- a/sound/soc/blackfin/bf5xx-ac97.c +++ b/sound/soc/blackfin/bf5xx-ac97.c @@ -294,11 +294,12 @@ static int asoc_bfin_ac97_probe(struct platform_device *pdev) /* Request PB3 as reset pin */ ret = devm_gpio_request_one(&pdev->dev, CONFIG_SND_BF5XX_RESET_GPIO_NUM, - GPIOF_OUT_INIT_HIGH, "SND_AD198x RESET") { + GPIOF_OUT_INIT_HIGH, "SND_AD198x RESET"); + if (ret) { dev_err(&pdev->dev, "Failed to request GPIO_%d for reset: %d\n", CONFIG_SND_BF5XX_RESET_GPIO_NUM, ret); - goto gpio_err; + return ret; } #endif diff --git a/sound/soc/blackfin/bf5xx-ac97.h b/sound/soc/blackfin/bf5xx-ac97.h index 15c635e33f4d..0c3e22d90a8d 100644 --- a/sound/soc/blackfin/bf5xx-ac97.h +++ b/sound/soc/blackfin/bf5xx-ac97.h @@ -9,7 +9,6 @@ #ifndef _BF5XX_AC97_H #define _BF5XX_AC97_H -extern struct snd_ac97_bus_ops bf5xx_ac97_ops; extern struct snd_ac97 *ac97; /* Frame format in memory, only support stereo currently */ struct ac97_frame { |