aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-06-06 19:15:05 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-07 19:03:05 -0400
commitc92a40e3a163b6708e0dd82ba4612f79df846912 (patch)
tree0a5cf29998b4d217b4d43c7eaf0bfe4428a140eb /sound/soc/tegra
parent40db77a0c4223d0b87c4b61ae38760d47593b7a5 (diff)
ASoC: tegra: use DAI's not card's dev for dev_err
This is the actual device of the I2S or SPDIF controller reporting the problem. If a future change converts these controllers to be CODECs, then there may be no pcm associated with the substream, so this change avoids a crash. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r--sound/soc/tegra/tegra20_i2s.c2
-rw-r--r--sound/soc/tegra/tegra20_spdif.c2
-rw-r--r--sound/soc/tegra/tegra30_i2s.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra20_i2s.c b/sound/soc/tegra/tegra20_i2s.c
index 9d5d4704da29..647daf610e4a 100644
--- a/sound/soc/tegra/tegra20_i2s.c
+++ b/sound/soc/tegra/tegra20_i2s.c
@@ -138,7 +138,7 @@ static int tegra20_i2s_hw_params(struct snd_pcm_substream *substream,
138 struct snd_pcm_hw_params *params, 138 struct snd_pcm_hw_params *params,
139 struct snd_soc_dai *dai) 139 struct snd_soc_dai *dai)
140{ 140{
141 struct device *dev = substream->pcm->card->dev; 141 struct device *dev = dai->dev;
142 struct tegra20_i2s *i2s = snd_soc_dai_get_drvdata(dai); 142 struct tegra20_i2s *i2s = snd_soc_dai_get_drvdata(dai);
143 u32 reg; 143 u32 reg;
144 int ret, sample_size, srate, i2sclock, bitcnt; 144 int ret, sample_size, srate, i2sclock, bitcnt;
diff --git a/sound/soc/tegra/tegra20_spdif.c b/sound/soc/tegra/tegra20_spdif.c
index ffbd99c4106e..f774a2d5e585 100644
--- a/sound/soc/tegra/tegra20_spdif.c
+++ b/sound/soc/tegra/tegra20_spdif.c
@@ -77,7 +77,7 @@ static int tegra20_spdif_hw_params(struct snd_pcm_substream *substream,
77 struct snd_pcm_hw_params *params, 77 struct snd_pcm_hw_params *params,
78 struct snd_soc_dai *dai) 78 struct snd_soc_dai *dai)
79{ 79{
80 struct device *dev = substream->pcm->card->dev; 80 struct device *dev = dai->dev;
81 struct tegra20_spdif *spdif = snd_soc_dai_get_drvdata(dai); 81 struct tegra20_spdif *spdif = snd_soc_dai_get_drvdata(dai);
82 int ret, spdifclock; 82 int ret, spdifclock;
83 83
diff --git a/sound/soc/tegra/tegra30_i2s.c b/sound/soc/tegra/tegra30_i2s.c
index 9c5c0e6819eb..2327f62e8a8c 100644
--- a/sound/soc/tegra/tegra30_i2s.c
+++ b/sound/soc/tegra/tegra30_i2s.c
@@ -181,7 +181,7 @@ static int tegra30_i2s_hw_params(struct snd_pcm_substream *substream,
181 struct snd_pcm_hw_params *params, 181 struct snd_pcm_hw_params *params,
182 struct snd_soc_dai *dai) 182 struct snd_soc_dai *dai)
183{ 183{
184 struct device *dev = substream->pcm->card->dev; 184 struct device *dev = dai->dev;
185 struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai); 185 struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai);
186 u32 val; 186 u32 val;
187 int ret, sample_size, srate, i2sclock, bitcnt; 187 int ret, sample_size, srate, i2sclock, bitcnt;