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

Commit 13e2c86c authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.30' into for-2.6.31

parents 97b8096d 1ffafeb5

sound/arm/pxa2xx-ac97-lib.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static void set_resetgpio_mode(int resetgpio_action) 
		switch (resetgpio_action) {

		case RESETGPIO_NORMAL_ALTFUNC:

			if (reset_gpio == 113)

				mode = 113 | GPIO_OUT | GPIO_DFLT_LOW;

				mode = 113 | GPIO_ALT_FN_2_OUT;

			if (reset_gpio == 95)

				mode = 95 | GPIO_ALT_FN_1_OUT;

			break;

sound/soc/soc-core.c

+3 −0
Original line number Diff line number Diff line
@@ -992,6 +992,9 @@ static int soc_remove(struct platform_device *pdev) 
	struct snd_soc_platform *platform = card->platform;

	struct snd_soc_codec_device *codec_dev = socdev->codec_dev;



	if (!card->instantiated)

		return 0;



	run_delayed_work(&card->delayed_work);



	if (platform->remove)