ASoC: ssm2602: do not hardcode type to SSM2602
authorStefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Mon, 29 Sep 2014 19:39:13 +0000 (22:39 +0300)
committerMark Brown <broonie@kernel.org>
Tue, 30 Sep 2014 12:27:19 +0000 (13:27 +0100)
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
sound/soc/codecs/ssm2602.c

index 484b3bbe8624be1cff63a1bd5154c8034ab80ef8..4021cd4357409e9ee95080ae9e61bb5752774272 100644 (file)
@@ -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,