ASoC: ssm2602: Do not dereference codec->control_data
authorLars-Peter Clausen <lars@metafoo.de>
Tue, 20 Sep 2011 06:19:58 +0000 (08:19 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 20 Sep 2011 11:59:07 +0000 (12:59 +0100)
The driver assumes that control_data points to the drivers i2c_client struct,
but this is no longer the case since the ASoC core has switched to regmap.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/ssm2602.c

index 84f4ad56855601f63b582d7aaa5e29b5fce438fd..cceb0022f02c3c660c873a45e979e028ef91ddc8 100644 (file)
@@ -294,7 +294,6 @@ static int ssm2602_startup(struct snd_pcm_substream *substream,
        struct snd_soc_pcm_runtime *rtd = substream->private_data;
        struct snd_soc_codec *codec = rtd->codec;
        struct ssm2602_priv *ssm2602 = snd_soc_codec_get_drvdata(codec);
-       struct i2c_client *i2c = codec->control_data;
        struct snd_pcm_runtime *master_runtime;
 
        /* The DAI has shared clocks so if we already have a playback or
@@ -303,7 +302,7 @@ static int ssm2602_startup(struct snd_pcm_substream *substream,
         */
        if (ssm2602->master_substream) {
                master_runtime = ssm2602->master_substream->runtime;
-               dev_dbg(&i2c->dev, "Constraining to %d bits at %dHz\n",
+               dev_dbg(codec->dev, "Constraining to %d bits at %dHz\n",
                        master_runtime->sample_bits,
                        master_runtime->rate);