Commit b7c2dc8e authored Oct 01, 2014 by Takashi Iwai

Merge tag 'asoc-v3.17-rc7' of...

Merge tag 'asoc-v3.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fix SSM2602 device identification

Another fix for v3.17, fixing device identification after the split out
of the I2C and SPI code.

parents 5498380e fe2a08b3

sound/soc/codecs/ssm2602.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -647,7 +647,7 @@ int ssm2602_probe(struct device *dev, enum ssm2602_type type,
		return -ENOMEM;

		dev_set_drvdata(dev, ssm2602);
		ssm2602->type = SSM2602;
		ssm2602->type = type;
		ssm2602->regmap = regmap;

		return snd_soc_register_codec(dev, &soc_codec_dev_ssm2602,