Commit 68817ee4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.1' into for-3.2

parents 0473e61b 371e7305

sound/soc/codecs/wm8750.c

+7 −0
Original line number Diff line number Diff line
@@ -778,11 +778,18 @@ static int __devexit wm8750_spi_remove(struct spi_device *spi) 
	return 0;

}



static const struct spi_device_id wm8750_spi_ids[] = {

	{ "wm8750", 0 },

	{ "wm8987", 0 },

};

MODULE_DEVICE_TABLE(spi, wm8750_spi_id);



static struct spi_driver wm8750_spi_driver = {

	.driver = {

		.name	= "wm8750-codec",

		.owner	= THIS_MODULE,

	},

	.id_table	= wm8750_spi_ids,

	.probe		= wm8750_spi_probe,

	.remove		= __devexit_p(wm8750_spi_remove),

};

sound/soc/samsung/jive_wm8750.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static struct snd_soc_dai_link jive_dai = { 
	.cpu_dai_name	= "s3c2412-i2s",

	.codec_dai_name = "wm8750-hifi",

	.platform_name	= "samsung-audio",

	.codec_name	= "wm8750-codec.0-0x1a",

	.codec_name	= "wm8750-codec.0-001a",

	.init		= jive_wm8750_init,

	.ops		= &jive_ops,

};

sound/soc/samsung/speyside_wm8962.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int speyside_wm8962_set_bias_level(struct snd_soc_card *card, 
						     44100 * 256,

						     SND_SOC_CLOCK_IN);

			if (ret < 0) {

				pr_err("Failed to set SYSCLK: %d\n");

				pr_err("Failed to set SYSCLK: %d\n", ret);

				return ret;

			}

		}