diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-01 03:29:26 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-01 03:29:26 -0400 |
| commit | b7c2dc8e684a37d8f9544b9e528c050f2bb7ef47 (patch) | |
| tree | fe0f18b10ecccf0336767df2b11bd87da21b7fbc /sound | |
| parent | 5498380e4f403c0938801e2cd6683353d0029cac (diff) | |
| parent | fe2a08b3bf1a6e35c00e18843bc19aa1778432c3 (diff) | |
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.c | 2 |
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, | |||
| 647 | return -ENOMEM; | 647 | return -ENOMEM; |
| 648 | 648 | ||
| 649 | dev_set_drvdata(dev, ssm2602); | 649 | dev_set_drvdata(dev, ssm2602); |
| 650 | ssm2602->type = SSM2602; | 650 | ssm2602->type = type; |
| 651 | ssm2602->regmap = regmap; | 651 | ssm2602->regmap = regmap; |
| 652 | 652 | ||
| 653 | return snd_soc_register_codec(dev, &soc_codec_dev_ssm2602, | 653 | return snd_soc_register_codec(dev, &soc_codec_dev_ssm2602, |