diff options
| author | Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> | 2014-09-29 21:39:13 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-09-30 14:27:19 +0200 |
| commit | fe2a08b3bf1a6e35c00e18843bc19aa1778432c3 (patch) | |
| tree | a7d7ff53e0ae056649710a2fe42af661706c6d5f /sound/soc/codecs/ssm2602.c | |
| parent | Linux 3.17-rc1 (diff) | |
| download | linux-fe2a08b3bf1a6e35c00e18843bc19aa1778432c3.tar.xz linux-fe2a08b3bf1a6e35c00e18843bc19aa1778432c3.zip | |
ASoC: ssm2602: do not hardcode type to SSM2602
The correct type (SSM2602/SSM2603/SSM2604) is passed down
from the ssm2602_spi_probe()/ssm2602_spi_probe() functions,
so use that instead of hardcoding it to SSM2602 in
ssm2602_probe().
Fixes: c924dc68f737 ("ASoC: ssm2602: Split SPI and I2C code into different modules")
Signed-off-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Signed-off-by: Mark Brown <broonie@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Cc: stable@vger.kernel.org
Diffstat (limited to 'sound/soc/codecs/ssm2602.c')
| -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, 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, |