From b8abd1d89889d87bda5e7e24b45579e7e7799d24 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 6 Jun 2012 17:15:05 -0600
Subject: [PATCH] --- yaml --- r: 316222 b: refs/heads/master c:
 c92a40e3a163b6708e0dd82ba4612f79df846912 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/sound/soc/tegra/tegra20_i2s.c   | 2 +-
 trunk/sound/soc/tegra/tegra20_spdif.c | 2 +-
 trunk/sound/soc/tegra/tegra30_i2s.c   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 367ea00f447d..918562e64042 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40db77a0c4223d0b87c4b61ae38760d47593b7a5
+refs/heads/master: c92a40e3a163b6708e0dd82ba4612f79df846912
diff --git a/trunk/sound/soc/tegra/tegra20_i2s.c b/trunk/sound/soc/tegra/tegra20_i2s.c
index 9d5d4704da29..647daf610e4a 100644
--- a/trunk/sound/soc/tegra/tegra20_i2s.c
+++ b/trunk/sound/soc/tegra/tegra20_i2s.c
@@ -138,7 +138,7 @@ static int tegra20_i2s_hw_params(struct snd_pcm_substream *substream,
 				 struct snd_pcm_hw_params *params,
 				 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);
 	u32 reg;
 	int ret, sample_size, srate, i2sclock, bitcnt;
diff --git a/trunk/sound/soc/tegra/tegra20_spdif.c b/trunk/sound/soc/tegra/tegra20_spdif.c
index ffbd99c4106e..f774a2d5e585 100644
--- a/trunk/sound/soc/tegra/tegra20_spdif.c
+++ b/trunk/sound/soc/tegra/tegra20_spdif.c
@@ -77,7 +77,7 @@ static int tegra20_spdif_hw_params(struct snd_pcm_substream *substream,
 				struct snd_pcm_hw_params *params,
 				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);
 	int ret, spdifclock;
 
diff --git a/trunk/sound/soc/tegra/tegra30_i2s.c b/trunk/sound/soc/tegra/tegra30_i2s.c
index 9c5c0e6819eb..2327f62e8a8c 100644
--- a/trunk/sound/soc/tegra/tegra30_i2s.c
+++ b/trunk/sound/soc/tegra/tegra30_i2s.c
@@ -181,7 +181,7 @@ static int tegra30_i2s_hw_params(struct snd_pcm_substream *substream,
 				 struct snd_pcm_hw_params *params,
 				 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);
 	u32 val;
 	int ret, sample_size, srate, i2sclock, bitcnt;