December 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] warnings with clk_disable_unprepare()
by Pierre-Louis Bossart 08 Dec '16

08 Dec '16

Hi, In the modified cht-bsw_rt5645 machine driver for Asus X205TA and T100HA, I disable the audio mclk with a call to clk_disable_unprepare() when I see a SND_SOC_DAPM_EVENT_OFF event in the platform_clock_control hook. For some reason I seem to get multiple SND_SOC_DAPM_EVENT_OFF events and the clock framework complains with dmesg warnings that the refcount is already zero (which has no functional side effect). WARNING: CPU: 0 PID: 2002 at drivers/clk/clk.c:476 clk_unprepare+0x1a/0x21 WARNING: CPU: 2 PID: 2095 at drivers/clk/clk.c:594 clk_core_disable_lock+0x12/0x1b I could fix this in three different ways: - remove multiple SND_SOC_DAPM_EVENT_OFF events (not sure what the root cause is, maybe issues with jack detection?) - call a clk_is_enabled() or clk_refcount() function before calling clk_disable_unprepare() (but they don't seem to exist in include/linux/clk.h) - count the references myself (which does exactly the same as what the clk framework already does so it's not terribly elegant) Any suggestions on what the least-bad solution might be? Thanks -Pierre

2 1

[alsa-devel] [PATCH V2 1/2] ASoC: samsung: include gpio consumer.h
by Fabian Frederick 08 Dec '16

08 Dec '16

Fix the following build errors on X86_32 !GPIOLIB sound/soc/samsung/tm2_wm5110.c:220:3: error: implicit declaration of function 'gpiod_set_value_cansleep' [-Werror=implicit-function-declaration] sound/soc/samsung/tm2_wm5110.c:438:24: error: implicit declaration of function 'devm_gpiod_get' [-Werror=implicit-function-declaration] Signed-off-by: Fabian Frederick <fabf(a)skynet.be> --- V2: -Add configuration settings (suggested by Krzysztof Kozlowski) sound/soc/samsung/tm2_wm5110.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/samsung/tm2_wm5110.c b/sound/soc/samsung/tm2_wm5110.c index 5cdf7d1..24cc9d6 100644 --- a/sound/soc/samsung/tm2_wm5110.c +++ b/sound/soc/samsung/tm2_wm5110.c @@ -12,6 +12,7 @@ #include <linux/clk.h> #include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/module.h> #include <linux/of.h> #include <sound/pcm_params.h> -- 2.7.4

2 1

[alsa-devel] [bug report] ASoC: topology: Only free TLV for volume mixers of a widget
by Dan Carpenter 08 Dec '16

08 Dec '16

Hello Mengdong Lin, The patch eea3dd4f1247: "ASoC: topology: Only free TLV for volume mixers of a widget" from Nov 25, 2016, leads to the following static checker warning: sound/soc/soc-topology.c:1566 soc_tplg_dapm_widget_create() error: uninitialized symbol 'kcontrol_type'. sound/soc/soc-topology.c 1440 static int soc_tplg_dapm_widget_create(struct soc_tplg *tplg, 1441 struct snd_soc_tplg_dapm_widget *w) 1442 { 1443 struct snd_soc_dapm_context *dapm = &tplg->comp->dapm; 1444 struct snd_soc_dapm_widget template, *widget; 1445 struct snd_soc_tplg_ctl_hdr *control_hdr; 1446 struct snd_soc_card *card = tplg->comp->card; 1447 unsigned int kcontrol_type; ^^^^^^^^^^^^^ 1448 int ret = 0; 1449 1450 if (strnlen(w->name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == 1451 SNDRV_CTL_ELEM_ID_NAME_MAXLEN) 1452 return -EINVAL; 1453 if (strnlen(w->sname, SNDRV_CTL_ELEM_ID_NAME_MAXLEN) == 1454 SNDRV_CTL_ELEM_ID_NAME_MAXLEN) 1455 return -EINVAL; 1456 1457 dev_dbg(tplg->dev, "ASoC: creating DAPM widget %s id %d\n", 1458 w->name, w->id); 1459 1460 memset(&template, 0, sizeof(template)); 1461 1462 /* map user to kernel widget ID */ 1463 template.id = get_widget_id(w->id); 1464 if (template.id < 0) 1465 return template.id; 1466 1467 template.name = kstrdup(w->name, GFP_KERNEL); 1468 if (!template.name) 1469 return -ENOMEM; 1470 template.sname = kstrdup(w->sname, GFP_KERNEL); 1471 if (!template.sname) { 1472 ret = -ENOMEM; 1473 goto err; 1474 } 1475 template.reg = w->reg; 1476 template.shift = w->shift; 1477 template.mask = w->mask; 1478 template.subseq = w->subseq; 1479 template.on_val = w->invert ? 0 : 1; 1480 template.off_val = w->invert ? 1 : 0; 1481 template.ignore_suspend = w->ignore_suspend; 1482 template.event_flags = w->event_flags; 1483 template.dobj.index = tplg->index; 1484 1485 tplg->pos += 1486 (sizeof(struct snd_soc_tplg_dapm_widget) + w->priv.size); 1487 if (w->num_kcontrols == 0) { 1488 template.num_kcontrols = 0; 1489 goto widget; Assume we hit this goto. 1490 } 1491 1492 control_hdr = (struct snd_soc_tplg_ctl_hdr *)tplg->pos; 1493 dev_dbg(tplg->dev, "ASoC: template %s has %d controls of type %x\n", 1494 w->name, w->num_kcontrols, control_hdr->type); [ snip ] 1546 1547 widget: 1548 ret = soc_tplg_widget_load(tplg, &template, w); 1549 if (ret < 0) 1550 goto hdr_err; 1551 1552 /* card dapm mutex is held by the core if we are loading topology 1553 * data during sound card init. */ 1554 if (card->instantiated) 1555 widget = snd_soc_dapm_new_control(dapm, &template); 1556 else 1557 widget = snd_soc_dapm_new_control_unlocked(dapm, &template); 1558 if (widget == NULL) { 1559 dev_err(tplg->dev, "ASoC: failed to create widget %s controls\n", 1560 w->name); 1561 ret = -ENOMEM; 1562 goto hdr_err; 1563 } 1564 1565 widget->dobj.type = SND_SOC_DOBJ_WIDGET; 1566 widget->dobj.widget.kcontrol_type = kcontrol_type; Then it's not initialized here. I don't know if this causes an issue beyond the static checker warning. 1567 widget->dobj.ops = tplg->ops; 1568 widget->dobj.index = tplg->index; 1569 kfree(template.sname); regards, dan carpenter

2 1

[alsa-devel] [PATCH 1/2] ASoC: zte: spdif and i2s drivers are not zx296702 specific
by Shawn Guo 08 Dec '16

08 Dec '16

From: Shawn Guo <shawn.guo(a)linaro.org> ZTE ZX SPDIF and I2S drivers can work on not only ZX296702 but also other ZTE ZX family SoCs like ZX296718, which is an arm64 platform. Let's make a few renaming and tweak the Kconfig a bit to get the drivers available for other ZTE ZX platforms. Signed-off-by: Shawn Guo <shawn.guo(a)linaro.org> --- sound/soc/zte/Kconfig | 16 ++++++++-------- sound/soc/zte/Makefile | 4 ++-- sound/soc/zte/{zx296702-i2s.c => zx-i2s.c} | 0 sound/soc/zte/{zx296702-spdif.c => zx-spdif.c} | 0 4 files changed, 10 insertions(+), 10 deletions(-) rename sound/soc/zte/{zx296702-i2s.c => zx-i2s.c} (100%) rename sound/soc/zte/{zx296702-spdif.c => zx-spdif.c} (100%) diff --git a/sound/soc/zte/Kconfig b/sound/soc/zte/Kconfig index c47eb25e441f..6d8a90d36315 100644 --- a/sound/soc/zte/Kconfig +++ b/sound/soc/zte/Kconfig @@ -1,17 +1,17 @@ -config ZX296702_SPDIF - tristate "ZX296702 spdif" - depends on SOC_ZX296702 || COMPILE_TEST +config ZX_SPDIF + tristate "ZTE ZX SPDIF Driver Support" + depends on ARCH_ZX || COMPILE_TEST depends on COMMON_CLK select SND_SOC_GENERIC_DMAENGINE_PCM help Say Y or M if you want to add support for codecs attached to the - zx296702 spdif interface + ZTE ZX SPDIF interface -config ZX296702_I2S - tristate "ZX296702 i2s" - depends on SOC_ZX296702 || COMPILE_TEST +config ZX_I2S + tristate "ZTE ZX I2S Driver Support" + depends on ARCH_ZX || COMPILE_TEST depends on COMMON_CLK select SND_SOC_GENERIC_DMAENGINE_PCM help Say Y or M if you want to add support for codecs attached to the - zx296702 i2s interface + ZTE ZX I2S interface diff --git a/sound/soc/zte/Makefile b/sound/soc/zte/Makefile index 254ed2c8c1a0..77768f5fd10c 100644 --- a/sound/soc/zte/Makefile +++ b/sound/soc/zte/Makefile @@ -1,2 +1,2 @@ -obj-$(CONFIG_ZX296702_SPDIF) += zx296702-spdif.o -obj-$(CONFIG_ZX296702_I2S) += zx296702-i2s.o +obj-$(CONFIG_ZX_SPDIF) += zx-spdif.o +obj-$(CONFIG_ZX_I2S) += zx-i2s.o diff --git a/sound/soc/zte/zx296702-i2s.c b/sound/soc/zte/zx-i2s.c similarity index 100% rename from sound/soc/zte/zx296702-i2s.c rename to sound/soc/zte/zx-i2s.c diff --git a/sound/soc/zte/zx296702-spdif.c b/sound/soc/zte/zx-spdif.c similarity index 100% rename from sound/soc/zte/zx296702-spdif.c rename to sound/soc/zte/zx-spdif.c -- 1.9.1

3 5

[alsa-devel] [PATCH] ASoC: Intel: Skylake: remove unused 'out_fmt' variable
by Kirtika Ruchandani 08 Dec '16

08 Dec '16

Commit 4cd9899f0d16 introduced struct skl_module_fmt* out_fmt without using it. Compiling with W=1 gives the below warning, fix it. sound/soc/intel/skylake/skl-topology.c: In function ‘skl_tplg_update_buffer_size’: sound/soc/intel/skylake/skl-topology.c:301:34: warning: variable ‘out_fmt’ set but not used [-Wunused-but-set-variable] This is a harmless warning and is only being fixed to reduce the noise with W=1 in the kernel. Fixes: 4cd9899f0d16 ("ASoC: Intel: Skylake: Add multiple pin formats") Cc: Hardik T Shah <hardik.t.shah(a)intel.com> Cc: Omair M Abdullah <omair.m.abdullah(a)intel.com> Cc: Jeeja KP <jeeja.kp(a)intel.com> Cc: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Cc: Vinod Koul <vinod.koul(a)intel.com> Cc: Mark Brown <broonie(a)kernel.org> Signed-off-by: Kirtika Ruchandani <kirtika(a)chromium.org> --- sound/soc/intel/skylake/skl-topology.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index bd313c9..4352236a 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -298,7 +298,7 @@ static void skl_tplg_update_buffer_size(struct skl_sst *ctx, struct skl_module_cfg *mcfg) { int multiplier = 1; - struct skl_module_fmt *in_fmt, *out_fmt; + struct skl_module_fmt *in_fmt; int in_rate, out_rate; @@ -306,7 +306,6 @@ static void skl_tplg_update_buffer_size(struct skl_sst *ctx, * change for pin 0 only */ in_fmt = &mcfg->in_fmt[0]; - out_fmt = &mcfg->out_fmt[0]; if (mcfg->m_type == SKL_MODULE_TYPE_SRCINT) multiplier = 5; -- 2.8.0.rc3.226.g39d4020

3 3

[alsa-devel] [PATCH] ASoC: Intel: Skylake: remove unused 'runtime' variable
by Kirtika Ruchandani 08 Dec '16

08 Dec '16

skl_platform_open() defines and sets 'struct snd_pcm_runtime* runtime' but does not use it. Compiling with W=1 gives the following warning, fix it. sound/soc/intel/skylake/skl-pcm.c: In function ‘skl_platform_open’: sound/soc/intel/skylake/skl-pcm.c:941:26: warning: variable ‘runtime’ set but not used [-Wunused-but-set-variable] This was introduced with the initial driver commit a40e693c7f5e ("ASoC: Intel: Add Skylake HDA platform driver"). This is a harmless warning and is only being fixed to reduce the noise with W=1 in the kernel. Fixes: a40e693c7f5e ("ASoC: Intel: Add Skylake HDA platform driver") Cc: Jeeja KP <jeeja.kp(a)intel.com> Cc: Subhransu S. Prusty <subhransu.s.prusty(a)intel.com> Cc: Vinod Koul <vinod.koul(a)intel.com> Cc: Mark Brown <broonie(a)kernel.org> Signed-off-by: Kirtika Ruchandani <kirtika(a)chromium.org> --- sound/soc/intel/skylake/skl-pcm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 84b5101..3254507 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -938,14 +938,12 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { static int skl_platform_open(struct snd_pcm_substream *substream) { - struct snd_pcm_runtime *runtime; struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_dai_link *dai_link = rtd->dai_link; dev_dbg(rtd->cpu_dai->dev, "In %s:%s\n", __func__, dai_link->cpu_dai_name); - runtime = substream->runtime; snd_soc_set_runtime_hwparams(substream, &azx_pcm_hw); return 0; -- 2.8.0.rc3.226.g39d4020

2 1

[alsa-devel] [PATCH v5 00/14] ASoC: add OF graph base simple-card
by Kuninori Morimoto 08 Dec '16

08 Dec '16

Hi Rob, Mark These are v5 of OF graph base simple-card patch-set. I removed new "type" property on v4 patch-set, but I noticed that it is necessary for ALSA SoC binding purpose. Thus, this v5 has it again. For example HDMI case, its DT will has video and sound ports. This DT will be used from HDMI Video driver and HDMI sound driver. HDMI video side can handle all somehow, because it is fully under its control. HDMI sound side will just references it. But it can't know total Video/Sound ports number which is necessary for ALSA SoC side. For example, if HDMI video had 4 ports, sound had 2 ports, this case, HDMI sound ports will be port@4, port@5. Here, ALSA SoC side needs to know total 2 sound port, and, it should be handled as 1st / 2nd port. It is impossible without "type" property. 1) - 7) : OF graph new feature 8) - 14) : OF graph base simple-card Kuninori Morimoto (14): 1) Documentation: of: add type property 2) of_graph: add of_graph_get_remote_endpoint() 3) of_graph: add of_graph_port_type_is() 4) of_graph: add of_graph_get_port_parent() 5) of_graph: add of_graph_get_top_port() 6) of_graph: add for_each_of_port() / for_each_of_endpoint_in_port() 7) of_graph: add of_graph_get_endpoint_count() 8) ASoC: simple-card-utils: adjust for graph on asoc_simple_card_parse_card_name 9) ASoC: simple-card-utils: add asoc_simple_card_parse_graph_dai() 10) ASoC: simple-card-utils: add asoc_simple_card_try_to_probe_graph_card() 11) ASoC: add simple-graph-card document 12) ASoC: add simple-graph-card support 13) ASoC: add simple-graph-scu-card document 14) ASoC: add simple-graph-scu-card support Documentation/devicetree/bindings/graph.txt | 21 + .../bindings/sound/simple-graph-card.txt | 67 +++ .../bindings/sound/simple-graph-scu-card.txt | 69 +++ drivers/of/base.c | 166 +++++++- include/linux/of_graph.h | 67 +++ include/sound/simple_card_utils.h | 13 + sound/soc/generic/Kconfig | 15 + sound/soc/generic/Makefile | 4 + sound/soc/generic/simple-card-utils.c | 98 ++++- sound/soc/generic/simple-card.c | 2 +- sound/soc/generic/simple-graph-card.c | 461 +++++++++++++++++++++ sound/soc/generic/simple-graph-scu-card.c | 441 ++++++++++++++++++++ sound/soc/generic/simple-scu-card.c | 2 +- 13 files changed, 1413 insertions(+), 13 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/simple-graph-card.txt create mode 100644 Documentation/devicetree/bindings/sound/simple-graph-scu-card.txt create mode 100644 sound/soc/generic/simple-graph-card.c create mode 100644 sound/soc/generic/simple-graph-scu-card.c -- 1.9.1

3 30

[alsa-devel] [PATCH v4 0/2] ALSA controls management using index/device/sub-devices fields
by Arnaud Pouliquen 07 Dec '16

07 Dec '16

Previous discussions summary: - Topic of the patchset: Patch concerns ASoc DAI drivers. Aim is to be able to instantiate PCM control using device field according to the associated PCM char device. For this, a relationship between DAIs PCM control and PCM char device needs to be establish. => Proposal is to add field in DAI driver struct to declare PCM controls that need to be linked to PCM character device on DAI link probing. - Limitation of the patchset: This patchset seems only a first step as 2 concerns are been highlighted: - Patch is limited to "static" DAI-link. This not responds to backend (no_pcm dai links) and some none-DAI codecs, that could register PCm controls. In theses cases it is not possible to establish relationship during probe. => No solution proposed for time beeing. - This patchset does not fix conflict of 2 "identical" PCM controls declared by 2 drivers. For instance, a conflict can exist between a PCM control created in DAI driver and the same control declared in a codec driver. As index field is forced to 0, prefix should be used in codec. => To discuss solution in a separate thread as issue already present without this patchset several approaches seem possible like using index field ( control auto indexation in ASoC) or prefix in Naming. V4: - [PATCH v4 1/2] ASoC: core: allow DAI PCM controls bound to PCM device Fix and rework error management in soc_link_dai_pcm_controls function. - [PATCH v4 2/2] ASoC: sti: bind pcm controls to pcm device. No change since V2. V3: - [PATCH v3 1/2] ASoC: core: allow DAI PCM controls bound to PCM device Code optimization based on Takashi Sakamoto suggestion - [RFC V2 3/3] ASoC: hdmi-codec: Example of PCM control bound to PCM device for multi patch suppressed as it was send as example in previous version. Patch is valid but can have impact on existing drivers as control device field value is updated - [PATCH v3 2/2] ASoC: sti: bind pcm controls to pcm device. No change vs V2 V2: http://www.spinics.net/lists/alsa-devel/msg57045.html Aim of this version is to continue discussion on DAI PCM control focused on ASoC drivers. In this V2 implementation in Soc-core is simplified to limit impact on existing code. Update of the RFC V1 based on discussions: - [RFC 4/4] iecset: allow to select control with device and sub-device numbers no more part of the RFC V2, will be discussed in a separate thread - [RFC 2/4] ALSA: control: increment index field for duplicated control. no more part of the RFC V2, no more need as RFC subject is PCM controls - [RFC V2 1/3] ASoC: core: allow DAI PCM controls bound to PCM device Patch reworked from V1 to simplify implementation - Binding is not done for Dai links tagged with no_pcm (DPCM). - no more possibility to add the controls after the DAI link probing. - [RFC V2 2/3] ASoC: sti: bind PCM controls to PCM device. - [RFC V2 3/3] ASoC: hdmi-codec: Example of PCM control bound to PCM device for multi Example of implementation in STI DAI driver and HDMI-codec drivers V1: http://www.spinics.net/lists/alsa-devel/msg56479.html 1) Alsa-utils patch - iecset: allow to select control with device and sub-device numbers This patch allows to access to 2 iec controls differentiated by device/sub-devices numbers => For me, this patch is mandatory to be able to address the ASoC IEC controls, in case of no fix is implemented to allows index field update in ASoC. 2) Alsa driver patches - ASoC: core: allow PCM control binding to PCM device Add relationship between DAIs PCM controls and PCM device. - ALSA: control: increment index field for duplicated control. Generic implementation of the patch proposed in HDA driver (http://git.kernel.org/cgit/linux/kernel/git/tiwai/sound.git/commit/?id=ea9b…) - ASoC: sti: use bind_pcm_ctl implementation of bind_pcm_ctl for sti driver. Arnaud Pouliquen (2): ASoC: core: allow DAI PCM controls bound to PCM device ASoC: sti: bind pcm controls to pcm device. include/sound/soc-dai.h | 4 ++++ sound/soc/soc-core.c | 35 +++++++++++++++++++++++++++++++++++ sound/soc/sti/sti_uniperif.c | 33 ++++----------------------------- 3 files changed, 43 insertions(+), 29 deletions(-) -- 1.9.1

3 5

[alsa-devel] [PATCH] speaker-test: Fix chmap wav file selection.
by Arnaud Pouliquen 07 Dec '16

07 Dec '16

The channel selection currently does not work properly when a channel map control is provided but no manual channel map was explicitly requested with "-m". For example, the CEA/HDMI 6ch (surround 5.1) map is: FL, FR, LFE, FC, RL, RR. Tested command: speaker-test -D hdmi -c 6 -t wav Speaker-test tries to play channels in this following order: 0 - Front Left 3 - Front Center 1 - Front Right 5 - Rear Right 4 - Rear Left 2 - LFE But wav file played on associated speakers are not aligned. Here are the real files played: 0- /usr/share/sounds/alsa/Front_Left.wav => OK 3- /usr/share/sounds/alsa/Rear_Right.wav => OK 1- /usr/share/sounds/alsa/Front_Right.wav => OK 5- /usr/share/sounds/alsa/Rear_Center.wav => KO 4- found file /usr/share/sounds/alsa/Front_Center.wav => KO 2- /usr/share/sounds/alsa/Rear_Left.wav => KO Issue is that associated wav files ordering is reworked only if channel_map_set variable is set. Fix consists in allowing wavs re-ordering if a channel mapping as been get or set, i.e. channel_map is not null. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen(a)st.com> --- speaker-test/speaker-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c index 5b9cbec..46b0589 100644 --- a/speaker-test/speaker-test.c +++ b/speaker-test/speaker-test.c @@ -843,7 +843,7 @@ static int setup_wav_file(int chn) return check_wav_file(chn, given_test_wav_file); #ifdef CONFIG_SUPPORT_CHMAP - if (channel_map_set && chn < channel_map->channels) { + if (channel_map && chn < channel_map->channels) { int channel = channel_map->pos[chn] - SND_CHMAP_FL; if (channel >= 0 && channel < MAX_CHANNELS) return check_wav_file(chn, wavs[channel]); -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: rsnd: tidyup ssi->usrcnt counter check in hw_params
by Kuninori Morimoto 07 Dec '16

07 Dec '16

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ssi->usrcnt will be updated on snd_soc_dai_ops::trigger, but snd_pcm_ops::hw_params will be called *before* it. Thus, ssi->usrcnt is still 0 when 1st call. rsnd_ssi_hw_params() needs to check its called count, this means trigger should be if (ssi->usrcnt) instead of if (ssi->usrcnt > 1). Reported-by: Nguyen Viet Dung <nv-dung(a)jinso.co.jp> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/ssi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 932047a..dcb3d0a 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -433,11 +433,14 @@ static int rsnd_ssi_hw_params(struct rsnd_mod *mod, int chan = params_channels(params); /* - * Already working. - * It will happen if SSI has parent/child connection. + * snd_pcm_ops::hw_params will be called *before* + * snd_soc_dai_ops::trigger. Thus, ssi->usrcnt is 0 + * in 1st call. */ - if (ssi->usrcnt > 1) { + if (ssi->usrcnt) { /* + * Already working. + * It will happen if SSI has parent/child connection. * it is error if child <-> parent SSI uses * different channels. */ -- 1.9.1

2 1