diff options
| author | Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> | 2014-09-29 22:39:13 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-09 12:23:47 -0700 |
| commit | 5b744c01491f0b12ac47e8db28065975fc65a0e2 (patch) | |
| tree | b981b62557150e45c67d341a1b0bd3ab3578874c | |
| parent | 7478bcf7d5594fba7a98b8fef615e8924caf7977 (diff) | |
| download | lwn-5b744c01491f0b12ac47e8db28065975fc65a0e2.tar.gz lwn-5b744c01491f0b12ac47e8db28065975fc65a0e2.zip | |
ASoC: ssm2602: do not hardcode type to SSM2602
commit fe2a08b3bf1a6e35c00e18843bc19aa1778432c3 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 97b0454eb346..eb1bb7414b8b 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, |