diff options
| author | Mark Brown <broonie@kernel.org> | 2019-02-06 20:31:39 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-02-06 20:31:39 +0300 |
| commit | e29fe437ea5d926ea23d806b2468bf60ee8dc08a (patch) | |
| tree | 958f74204fc7b15fb7a572c356bc15ac7384be01 /sound/soc/sh | |
| parent | 47306401835a095843df8d87a51848f7e5e5099e (diff) | |
| parent | c16e12010060c6c7a31f08b4a99513064cb53b7d (diff) | |
| download | linux-e29fe437ea5d926ea23d806b2468bf60ee8dc08a.tar.xz | |
Merge branch 'asoc-5.0' into asoc-5.1 for dapm table
Diffstat (limited to 'sound/soc/sh')
| -rw-r--r-- | sound/soc/sh/rcar/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 2c2c60a3f276..9834474684b1 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1524,14 +1524,14 @@ int rsnd_kctrl_new(struct rsnd_mod *mod, int ret; /* - * 1) Avoid duplicate register (ex. MIXer case) - * 2) re-register if card was rebinded + * 1) Avoid duplicate register for DVC with MIX case + * 2) Allow duplicate register for MIX + * 3) re-register if card was rebinded */ list_for_each_entry(kctrl, &card->controls, list) { struct rsnd_kctrl_cfg *c = kctrl->private_data; - if (strcmp(kctrl->id.name, name) == 0 && - c->mod == mod) + if (c == cfg) return 0; } |