Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 270835
b: refs/heads/master
c: 35f0678
h: refs/heads/master
i:
  270833: 91b5d2f
  270831: f5aef19
v: v3
  • Loading branch information
Mark Brown committed Oct 11, 2011
1 parent 6641a7a commit a3e5c17
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 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: f8cf149f3e1568da7ea9ec5148d18ed83ac530de
refs/heads/master: 35f0678ef7fc3a85d032bc870d1d11af6089e843
13 changes: 5 additions & 8 deletions trunk/sound/soc/samsung/goni_wm8994.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,6 @@ static int goni_wm8994_init(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_dapm_context *dapm = &codec->dapm;
int ret;

/* add goni specific widgets */
snd_soc_dapm_new_controls(dapm, goni_dapm_widgets,
ARRAY_SIZE(goni_dapm_widgets));

/* set up goni specific audio routes */
snd_soc_dapm_add_routes(dapm, goni_dapm_routes,
ARRAY_SIZE(goni_dapm_routes));

/* set endpoints to not connected */
snd_soc_dapm_nc_pin(dapm, "IN2LP:VXRN");
snd_soc_dapm_nc_pin(dapm, "IN2RP:VXRP");
Expand Down Expand Up @@ -253,6 +245,11 @@ static struct snd_soc_card goni = {
.name = "goni",
.dai_link = goni_dai,
.num_links = ARRAY_SIZE(goni_dai),

.dapm_widgets = goni_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(goni_dapm_widgets),
.dapm_routes = goni_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(goni_dapm_routes),
};

static int __init goni_init(void)
Expand Down

0 comments on commit a3e5c17

Please sign in to comment.