Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 92251
b: refs/heads/master
c: 29e36e4
h: refs/heads/master
i:
  92249: bd612bc
  92247: 0f62c9e
v: v3
  • Loading branch information
Mark Brown authored and Takashi Iwai committed Apr 24, 2008
1 parent bbee22d commit 484b7cb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1bfcd361461f25be7d6d180a8da30d02bc124046
refs/heads/master: 29e36e49bdb7f24ca7cc0fb980fab2c407a8a2c9
8 changes: 3 additions & 5 deletions trunk/sound/soc/pxa/poodle.c
Original file line number Diff line number Diff line change
Expand Up @@ -257,21 +257,19 @@ static int poodle_wm8731_init(struct snd_soc_codec *codec)
/* Add poodle specific controls */
for (i = 0; i < ARRAY_SIZE(wm8731_poodle_controls); i++) {
err = snd_ctl_add(codec->card,
snd_soc_cnew(&wm8731_poodle_controls[i],codec, NULL));
snd_soc_cnew(&wm8731_poodle_controls[i], codec, NULL));
if (err < 0)
return err;
}

/* Add poodle specific widgets */
for (i = 0; i < ARRAY_SIZE(wm8731_dapm_widgets); i++) {
for (i = 0; i < ARRAY_SIZE(wm8731_dapm_widgets); i++)
snd_soc_dapm_new_control(codec, &wm8731_dapm_widgets[i]);
}

/* Set up poodle specific audio path audio_map */
for (i = 0; audio_map[i][0] != NULL; i++) {
for (i = 0; audio_map[i][0] != NULL; i++)
snd_soc_dapm_connect_input(codec, audio_map[i][0],
audio_map[i][1], audio_map[i][2]);
}

snd_soc_dapm_sync_endpoints(codec);
return 0;
Expand Down

0 comments on commit 484b7cb

Please sign in to comment.