浏览代码

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.
Takashi Iwai 11 年之前
父节点
当前提交
b7c2dc8e68
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      sound/soc/codecs/ssm2602.c

+ 1 - 1
sound/soc/codecs/ssm2602.c

@@ -647,7 +647,7 @@ int ssm2602_probe(struct device *dev, enum ssm2602_type type,
 		return -ENOMEM;
 		return -ENOMEM;
 
 
 	dev_set_drvdata(dev, ssm2602);
 	dev_set_drvdata(dev, ssm2602);
-	ssm2602->type = SSM2602;
+	ssm2602->type = type;
 	ssm2602->regmap = regmap;
 	ssm2602->regmap = regmap;
 
 
 	return snd_soc_register_codec(dev, &soc_codec_dev_ssm2602,
 	return snd_soc_register_codec(dev, &soc_codec_dev_ssm2602,