| From fe2a08b3bf1a6e35c00e18843bc19aa1778432c3 Mon Sep 17 00:00:00 2001 |
| From: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> |
| Date: Mon, 29 Sep 2014 22:39:13 +0300 |
| Subject: ASoC: ssm2602: do not hardcode type to SSM2602 |
| |
| From: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi> |
| |
| 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> |
| |
| --- |
| sound/soc/codecs/ssm2602.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/sound/soc/codecs/ssm2602.c |
| +++ b/sound/soc/codecs/ssm2602.c |
| @@ -647,7 +647,7 @@ int ssm2602_probe(struct device *dev, en |
| 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, |
