diff options
Diffstat (limited to 'sound/soc/pxa/palm27x.c')
-rw-r--r-- | sound/soc/pxa/palm27x.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c index 4a9cf3083af0..48a73f64500b 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); |
@@ -146,19 +146,16 @@ static const struct snd_kcontrol_new palm27x_controls[] = { | |||
146 | 146 | ||
147 | static int palm27x_ac97_init(struct snd_soc_codec *codec) | 147 | static int palm27x_ac97_init(struct snd_soc_codec *codec) |
148 | { | 148 | { |
149 | int i, err; | 149 | int err; |
150 | 150 | ||
151 | snd_soc_dapm_nc_pin(codec, "OUT3"); | 151 | snd_soc_dapm_nc_pin(codec, "OUT3"); |
152 | snd_soc_dapm_nc_pin(codec, "MONOOUT"); | 152 | snd_soc_dapm_nc_pin(codec, "MONOOUT"); |
153 | 153 | ||
154 | /* add palm27x specific controls */ | 154 | /* add palm27x specific controls */ |
155 | for (i = 0; i < ARRAY_SIZE(palm27x_controls); i++) { | 155 | err = snd_soc_add_controls(codec, palm27x_controls, |
156 | err = snd_ctl_add(codec->card, | 156 | ARRAY_SIZE(palm27x_controls)); |
157 | snd_soc_cnew(&palm27x_controls[i], | 157 | if (err < 0) |
158 | codec, NULL)); | 158 | return err; |
159 | if (err < 0) | ||
160 | return err; | ||
161 | } | ||
162 | 159 | ||
163 | /* add palm27x specific widgets */ | 160 | /* add palm27x specific widgets */ |
164 | snd_soc_dapm_new_controls(codec, palm27x_dapm_widgets, | 161 | snd_soc_dapm_new_controls(codec, palm27x_dapm_widgets, |