aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-10-01 09:29:26 +0200
committerTakashi Iwai <tiwai@suse.de>2014-10-01 09:29:26 +0200
commitb7c2dc8e684a37d8f9544b9e528c050f2bb7ef47 (patch)
treefe0f18b10ecccf0336767df2b11bd87da21b7fbc /sound
parent5498380e4f403c0938801e2cd6683353d0029cac (diff)
parentfe2a08b3bf1a6e35c00e18843bc19aa1778432c3 (diff)
downloadlinux-b7c2dc8e684a37d8f9544b9e528c050f2bb7ef47.tar.gz
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.
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/ssm2602.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c
index 484b3bbe8624..4021cd435740 100644
--- a/sound/soc/codecs/ssm2602.c
+++ b/sound/soc/codecs/ssm2602.c
@@ -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,