diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-11 02:28:04 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-11 02:28:04 -0500 |
commit | 9e30d7718bb7402c7bdee631ad2aae2658c324f0 (patch) | |
tree | 51b898f8106fea24278e8313b64fc954a99729b5 /sound/soc/pxa | |
parent | 9e32ebdb3aa4e5d2366b032baa16b95f3d7788b9 (diff) |
ASoC: Fix forgotten replacements of socdev->codec
The snd_soc_codec was moved into socdev->card, but this change wasn't
applied in some places. Fixed now.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r-- | sound/soc/pxa/corgi.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/palm27x.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/poodle.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/spitz.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/tosa.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index 1ba25a559524..0d41be33d572 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c | |||
@@ -100,7 +100,7 @@ static void corgi_ext_control(struct snd_soc_codec *codec) | |||
100 | static int corgi_startup(struct snd_pcm_substream *substream) | 100 | static int corgi_startup(struct snd_pcm_substream *substream) |
101 | { | 101 | { |
102 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 102 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
103 | struct snd_soc_codec *codec = rtd->socdev->codec; | 103 | struct snd_soc_codec *codec = rtd->socdev->card->codec; |
104 | 104 | ||
105 | /* check the jack status at stream startup */ | 105 | /* check the jack status at stream startup */ |
106 | corgi_ext_control(codec); | 106 | corgi_ext_control(codec); |
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c index 4a9cf3083af0..29958cd9daec 100644 --- a/sound/soc/pxa/palm27x.c +++ b/sound/soc/pxa/palm27x.c | |||
@@ -55,7 +55,7 @@ static void palm27x_ext_control(struct snd_soc_codec *codec) | |||
55 | static int palm27x_startup(struct snd_pcm_substream *substream) | 55 | static int palm27x_startup(struct snd_pcm_substream *substream) |
56 | { | 56 | { |
57 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 57 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
58 | struct snd_soc_codec *codec = rtd->socdev->codec; | 58 | struct snd_soc_codec *codec = rtd->socdev->card->codec; |
59 | 59 | ||
60 | /* check the jack status at stream startup */ | 60 | /* check the jack status at stream startup */ |
61 | palm27x_ext_control(codec); | 61 | palm27x_ext_control(codec); |
diff --git a/sound/soc/pxa/poodle.c b/sound/soc/pxa/poodle.c index 6e9827189fff..3a62d4354ef6 100644 --- a/sound/soc/pxa/poodle.c +++ b/sound/soc/pxa/poodle.c | |||
@@ -77,7 +77,7 @@ static void poodle_ext_control(struct snd_soc_codec *codec) | |||
77 | static int poodle_startup(struct snd_pcm_substream *substream) | 77 | static int poodle_startup(struct snd_pcm_substream *substream) |
78 | { | 78 | { |
79 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 79 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
80 | struct snd_soc_codec *codec = rtd->socdev->codec; | 80 | struct snd_soc_codec *codec = rtd->socdev->card->codec; |
81 | 81 | ||
82 | /* check the jack status at stream startup */ | 82 | /* check the jack status at stream startup */ |
83 | poodle_ext_control(codec); | 83 | poodle_ext_control(codec); |
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index a3b9e6bdf979..1aafd8c645a1 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c | |||
@@ -109,7 +109,7 @@ static void spitz_ext_control(struct snd_soc_codec *codec) | |||
109 | static int spitz_startup(struct snd_pcm_substream *substream) | 109 | static int spitz_startup(struct snd_pcm_substream *substream) |
110 | { | 110 | { |
111 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 111 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
112 | struct snd_soc_codec *codec = rtd->socdev->codec; | 112 | struct snd_soc_codec *codec = rtd->socdev->card->codec; |
113 | 113 | ||
114 | /* check the jack status at stream startup */ | 114 | /* check the jack status at stream startup */ |
115 | spitz_ext_control(codec); | 115 | spitz_ext_control(codec); |
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index c77194f74c9b..09b5bada03b9 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c | |||
@@ -82,7 +82,7 @@ static void tosa_ext_control(struct snd_soc_codec *codec) | |||
82 | static int tosa_startup(struct snd_pcm_substream *substream) | 82 | static int tosa_startup(struct snd_pcm_substream *substream) |
83 | { | 83 | { |
84 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 84 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
85 | struct snd_soc_codec *codec = rtd->socdev->codec; | 85 | struct snd_soc_codec *codec = rtd->socdev->card->codec; |
86 | 86 | ||
87 | /* check the jack status at stream startup */ | 87 | /* check the jack status at stream startup */ |
88 | tosa_ext_control(codec); | 88 | tosa_ext_control(codec); |