Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d054318 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/blackfin' into asoc-linus

parents d2ee88d0 610d80ea

sound/soc/blackfin/bf5xx-ac97.c

+3 −2
Original line number Diff line number Diff line
@@ -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

sound/soc/blackfin/bf5xx-ac97.h

+0 −1
Original line number Diff line number Diff line
@@ -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 {