Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c92a40e3 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

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: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 40db77a0

sound/soc/tegra/tegra20_i2s.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -138,7 +138,7 @@ static int tegra20_i2s_hw_params(struct snd_pcm_substream *substream, 
				 struct snd_pcm_hw_params *params,

				 struct snd_pcm_hw_params *params,

				 struct snd_soc_dai *dai)

				 struct snd_soc_dai *dai)

{

{

	struct device *dev = substream->pcm->card->dev;

	struct device *dev = dai->dev;

	struct tegra20_i2s *i2s = snd_soc_dai_get_drvdata(dai);

	struct tegra20_i2s *i2s = snd_soc_dai_get_drvdata(dai);

	u32 reg;

	u32 reg;

	int ret, sample_size, srate, i2sclock, bitcnt;

	int ret, sample_size, srate, i2sclock, bitcnt;

sound/soc/tegra/tegra20_spdif.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,7 @@ static int tegra20_spdif_hw_params(struct snd_pcm_substream *substream, 
				struct snd_pcm_hw_params *params,

				struct snd_pcm_hw_params *params,

				struct snd_soc_dai *dai)

				struct snd_soc_dai *dai)

{

{

	struct device *dev = substream->pcm->card->dev;

	struct device *dev = dai->dev;

	struct tegra20_spdif *spdif = snd_soc_dai_get_drvdata(dai);

	struct tegra20_spdif *spdif = snd_soc_dai_get_drvdata(dai);

	int ret, spdifclock;

	int ret, spdifclock;

sound/soc/tegra/tegra30_i2s.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -181,7 +181,7 @@ static int tegra30_i2s_hw_params(struct snd_pcm_substream *substream, 
				 struct snd_pcm_hw_params *params,

				 struct snd_pcm_hw_params *params,

				 struct snd_soc_dai *dai)

				 struct snd_soc_dai *dai)

{

{

	struct device *dev = substream->pcm->card->dev;

	struct device *dev = dai->dev;

	struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai);

	struct tegra30_i2s *i2s = snd_soc_dai_get_drvdata(dai);

	u32 val;

	u32 val;

	int ret, sample_size, srate, i2sclock, bitcnt;

	int ret, sample_size, srate, i2sclock, bitcnt;