diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2011-09-20 08:19:58 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-09-20 13:59:07 +0200 |
| commit | 26806a4266c5d3301d3858317e67b1cca7ccfebb (patch) | |
| tree | d07479948888e4f8c1ee46528b535007ec67128c /sound/soc/codecs/ssm2602.c | |
| parent | ASoC: fsl: Fix error handling if platform_device_add fails (diff) | |
| download | linux-26806a4266c5d3301d3858317e67b1cca7ccfebb.tar.xz linux-26806a4266c5d3301d3858317e67b1cca7ccfebb.zip | |
ASoC: ssm2602: Do not dereference codec->control_data
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>
Diffstat (limited to 'sound/soc/codecs/ssm2602.c')
| -rw-r--r-- | sound/soc/codecs/ssm2602.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/codecs/ssm2602.c b/sound/soc/codecs/ssm2602.c index 84f4ad568556..cceb0022f02c 100644 --- a/sound/soc/codecs/ssm2602.c +++ b/sound/soc/codecs/ssm2602.c @@ -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); |