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

[alsa-devel] [PATCH v5 0/8] Add the family patches to support for kylin board
by Caesar Wang 03 Feb '16

03 Feb '16

Hi all, This series patches are based on kernel 4.5-rc1 version, also is based on Heiko's branch. (kernel/git/mmind/linux-rockchip.git -b for-next & v4.5-clk/fixes) e.g: boot log.. Linux version 4.5.0-rc1+ (wxt@ubuntu) ....#60 SMP Thu Jan 28 12:54:50 CST 2016 1) The kylin history series patches: V0: https://lkml.org/lkml/2015/12/22/168 V1: https://lkml.org/lkml/2015/12/17/319 V2: https://lkml.org/lkml/2016/1/7/66 V3: http://www.spinics.net/lists/arm-kernel/msg474796.html V4: https://lkml.org/lkml/2016/1/28/132 This series patches are verified on the following github: https://github.com/Caesar-github/rockchip/tree/kylin/next This series has 8 patches: (8--->1) c455bf5 ARM: dts: rockchip: support the spi for rk3036 41bbd5d ASoC: rt5616: add the mclk for the codec driver 6ee2dc0 ASoC: rt5616: trivial: fix the typo 2775e41 ASoC: rt5616: add mclk property for rt5616 document b4ec10b ARM: dts: rockchip: add mclk for rt5616 on kylin board 8d272a1 ARM: dts: rockchip: add support emac for RK3036 02e501f clk: rockchip: rk3036: fix and add node id for emac clock b948f42 ARM: dts: rockchip: add hdmi/vop device node for rk3036 .... This series patches can apply into Heiko for-next branch. (https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/log/?…) Also, ths ASoC can apply into Mark branch. --- 2) This series patches have the following decriptions: PATCH[1/8]: ====> add hdmi/vop display node for rk3036 ARM: dts: rockchip: add hdmi/vop device node for rk3036 This Patch is based on Ykk's Inno HDMI V7 patches. That's verified on my github. bd5ed3e ARM: dts: rockchip: add hdmi/vop device node for rk3036 438e7bd FROMLIST: dt-bindings: add document for Innosilicon HDMI on Rockchip platform ((am from https://patchwork.kernel.org/patch/8117611/)) ad0623b FROMLIST: drm/rockchip: hdmi: add Innosilicon HDMI support ((am https://patchwork.kernel.org/patch/8117571/)) PATCH[2/8-3/8]: Add the emac patch The emac clock is depend APLL, That shoud be incorrect. We should fix it on the DPLL. df91ab ARM: dts: rockchip: add support emac for RK3036 d5c2781 clk: rockchip: rk3036: fix and add node id for emac clock That's verified on kylin board with ubuntu os. How to test and verify? You can refer to the following wiki document. http://rockchip.wikidot.com/linux-develop-guide PATCH[4/8-7/8]: Make the codec work on kylin board 41bbd5d ASoC: rt5616: add the mclk for the codec driver 6ee2dc0 ASoC: rt5616: trivial: fix the typo 2775e41 ASoC: rt5616: add mclk property for rt5616 document b4ec10b ARM: dts: rockchip: add mclk for rt5616 on kylin board As the previous discussed on https://patchwork.kernel.org/patch/8041001/ Move the mclk into codec driver to enable and disable. How to test and verify? You can refer to the following wiki document. http://rockchip.wikidot.com/linux-develop-guide PATCH[8/8]: Make the codec work on kylin board Add the spi node for rk3036 dts, that's seem not related to the kylin. Maybe the future will support the spi on kylin board or connect the spi devices. f0fff43 ARM: dts: rockchip: support the spi for rk3036 --- Thanks your reviewing! :) - Caesar Changes in v5: - remove unused commit content. - Fix the wrong word, as the Rob comments on https://patchwork.kernel.org/patch/8147731/. - Cc the related alsa experts. -Cc releated alsa experts. - Cc related alsa experts. - Remove the unused, as Heiko comments on https://patchwork.kernel.org/patch/8147761/ - Modify the commit. Changes in v4: - solve the lastest conflict, picked up from https://patchwork.kernel.org/patch/8040961/. - fix the commit, pick up from the https://patchwork.kernel.org/patch/7976631/. - The emac parent shouldn't depend on the APLL. instead of DPLL. - included in the kylin series patches. - This patch picked up from https://patchwork.kernel.org/patch/7924971/ - Change to solve the conflict based on the Heiko's branch. - Make the emac parent as the DPLL. - AS the previous discussed by them, add the mclk for codec. (https://patchwork.kernel.org/patch/8041001/) - Add this patch included in kylin series patches. - Add this patch included in kylin series patches. - AS the previous discussed by them, add the mclk for codec. (https://patchwork.kernel.org/patch/8041001/) - Add this patch included in kylin series patches. Caesar Wang (6): ARM: dts: rockchip: add hdmi/vop device node for rk3036 ARM: dts: rockchip: add mclk for rt5616 on kylin board ASoC: rt5616: add mclk property for rt5616 document ASoC: rt5616: trivial: fix the typo ASoC: rt5616: add the mclk for the codec driver ARM: dts: rockchip: support the spi for rk3036 zhengxing (2): clk: rockchip: rk3036: fix and add node id for emac clock ARM: dts: rockchip: add support emac for RK3036 Documentation/devicetree/bindings/sound/rt5616.txt | 6 + arch/arm/boot/dts/rk3036-evb.dts | 23 ++ arch/arm/boot/dts/rk3036-kylin.dts | 35 ++ arch/arm/boot/dts/rk3036.dtsi | 145 ++++++++ drivers/clk/rockchip/clk-rk3036.c | 9 +- include/dt-bindings/clock/rk3036-cru.h | 2 + sound/soc/codecs/rt5616.c | 410 +++++++++++---------- 7 files changed, 442 insertions(+), 188 deletions(-) -- 1.9.1

2 5

[alsa-devel] [PATCH] ASoC: wm_adsp: Add missing const from region definitions
by Charles Keepax 02 Feb '16

02 Feb '16

Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 653dbff..28d3851 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -325,7 +325,7 @@ struct wm_adsp_buffer_region_def { unsigned int size_offset; }; -static struct wm_adsp_buffer_region_def default_regions[] = { +static const struct wm_adsp_buffer_region_def default_regions[] = { { .mem_type = WMFW_ADSP2_XM, .base_offset = HOST_BUFFER_FIELD(X_buf_base), @@ -347,7 +347,7 @@ struct wm_adsp_fw_caps { u32 id; struct snd_codec_desc desc; int num_regions; - struct wm_adsp_buffer_region_def *region_defs; + const struct wm_adsp_buffer_region_def *region_defs; }; static const struct wm_adsp_fw_caps ctrl_caps[] = { -- 2.1.4

2 1

[alsa-devel] [PATCH] ASoC: dwc: Ensure i2s_reg_comp{1, 2} is always initialised
by Jon Medhurst (Tixy) 02 Feb '16

02 Feb '16

In the case that the driver is configured from device-tree i2s_reg_comp1 and i2s_reg_comp2 aren't initialised, breaking the driver. Fix this by unconditionally setting these values before checking for quirks. Fixes: a242cac1d3aa ("ASoC: dwc: add quirk to override COMP_PARAM_1 register") Signed-off-by: Jon Medhurst <tixy(a)linaro.org> --- sound/soc/dwc/designware_i2s.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index d8afd8e..5f4e6aa 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c @@ -636,6 +636,8 @@ static int dw_i2s_probe(struct platform_device *pdev) dev->dev = &pdev->dev; + dev->i2s_reg_comp1 = I2S_COMP_PARAM_1; + dev->i2s_reg_comp2 = I2S_COMP_PARAM_2; if (pdata) { dev->capability = pdata->cap; clk_id = NULL; @@ -643,9 +645,6 @@ static int dw_i2s_probe(struct platform_device *pdev) if (dev->quirks & DW_I2S_QUIRK_COMP_REG_OFFSET) { dev->i2s_reg_comp1 = pdata->i2s_reg_comp1; dev->i2s_reg_comp2 = pdata->i2s_reg_comp2; - } else { - dev->i2s_reg_comp1 = I2S_COMP_PARAM_1; - dev->i2s_reg_comp2 = I2S_COMP_PARAM_2; } ret = dw_configure_dai_by_pd(dev, dw_i2s_dai, res, pdata); } else { -- 2.1.4

2 1

[alsa-devel] [PATCH] ASoC: wm_adsp: Return sample rate in wm_adsp_compr_pointer
by Charles Keepax 02 Feb '16

02 Feb '16

We should return a valid sample rate from the pointer callback, this patch adds this into the driver. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm_adsp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c index 28d3851..ed90e12 100644 --- a/sound/soc/codecs/wm_adsp.c +++ b/sound/soc/codecs/wm_adsp.c @@ -292,6 +292,8 @@ struct wm_adsp_compr { u32 *raw_buf; unsigned int copied_total; + + unsigned int sample_rate; }; #define WM_ADSP_DATA_WORD_SIZE 3 @@ -2484,6 +2486,8 @@ int wm_adsp_compr_set_params(struct snd_compr_stream *stream, if (!compr->raw_buf) return -ENOMEM; + compr->sample_rate = params->codec.sample_rate; + return 0; } EXPORT_SYMBOL_GPL(wm_adsp_compr_set_params); @@ -2923,6 +2927,7 @@ int wm_adsp_compr_pointer(struct snd_compr_stream *stream, tstamp->copied_total = compr->copied_total; tstamp->copied_total += buf->avail * WM_ADSP_DATA_WORD_SIZE; + tstamp->sampling_rate = compr->sample_rate; out: mutex_unlock(&dsp->pwr_lock); -- 2.1.4

2 1

[alsa-devel] [PATCH] ASoC: dpcm: fix the BE state on hw_free
by Vinod Koul 02 Feb '16

02 Feb '16

While performing hw_free, DPCM checks the BE state but leaves out the suspend state. The suspend state needs to be checked as well, as we might be suspended and then usermode closes rather than resuming the audio stream. This was found by a stress testing of system with playback in loop and killed after few seconds running in background and second script running suspend-resume test in loop Cc: stable(a)vger.kernel.org Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> Acked-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- sound/soc/soc-pcm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index bd5d3757acf6..659a7e9b2b81 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -1753,7 +1753,8 @@ int dpcm_be_dai_hw_free(struct snd_soc_pcm_runtime *fe, int stream) (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PREPARE) && (be->dpcm[stream].state != SND_SOC_DPCM_STATE_HW_FREE) && (be->dpcm[stream].state != SND_SOC_DPCM_STATE_PAUSED) && - (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP)) + (be->dpcm[stream].state != SND_SOC_DPCM_STATE_STOP) && + (be->dpcm[stream].state != SND_SOC_DPCM_STATE_SUSPEND)) continue; dev_dbg(be->dev, "ASoC: hw_free BE %s\n", -- 1.9.1

2 1

[alsa-devel] [PATCH] ASoC: Intel: Atom: fix regression on compress DAI
by Pierre-Louis Bossart 02 Feb '16

02 Feb '16

Commit a1068045883ed4a18363a4ebad0c3d55e473b716 added a dependency on the compress-cpu-dai channel_min field which was removed earlier by commit 77095796ae9cbaf315f80611edb5aa569796e339 as part of the baytrail cleanups. The net result was a regression at probe on all Atom platforms with no sound card created. Fix by adding explicit initialization for channel_min to 1 for the compress-cpu-dai. Reported-by: Tobias Mädel <alsa-devel(a)tbspace.de> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c index 55c33dc..52ed434 100644 --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c @@ -528,6 +528,7 @@ static struct snd_soc_dai_driver sst_platform_dai[] = { .ops = &sst_compr_dai_ops, .playback = { .stream_name = "Compress Playback", + .channels_min = 1, }, }, /* BE CPU Dais */ -- 1.9.1

2 2

Re: [alsa-devel] sound: use-after-free in snd_seq_deliver_single_event
by Mark Brown 02 Feb '16

02 Feb '16

On Mon, Feb 01, 2016 at 10:34:23PM +0900, Takashi Sakamoto wrote: > Well, I don't mind to receive them because it's a good information for > me to get current state of ALSA core functionality. If I had some > spare time, I was also going to fix it. But currently I have little > time for it due to my development for my minor hardwares... Yeah, my concern is that I'm getting to the point where I mentally tag them as irrelevant and delete them unread (the subject lines don't help here). I've had quite a few and none of them have been for code I even recall working on.

1 0

[alsa-devel] [PATCH] ALSA: timer: Sync timer deletion at closing the system timer
by Takashi Iwai 02 Feb '16

02 Feb '16

ALSA timer core framework has no sync point at stopping because it's called inside the spinlock. Thus we need a sync point at close for avoiding the stray timer task. This is simply done by implementing the close callback just calling del_timer_sync(). (It's harmless to call it unconditionally, as the core timer itself cares of the already deleted timer instance.) Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/timer.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/core/timer.c b/sound/core/timer.c index 12db60dd147b..b419e612f987 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1058,11 +1058,21 @@ static int snd_timer_s_stop(struct snd_timer * timer) return 0; } +static int snd_timer_s_close(struct snd_timer *timer) +{ + struct snd_timer_system_private *priv; + + priv = (struct snd_timer_system_private *)timer->private_data; + del_timer_sync(&priv->tlist); + return 0; +} + static struct snd_timer_hardware snd_timer_system = { .flags = SNDRV_TIMER_HW_FIRST | SNDRV_TIMER_HW_TASKLET, .resolution = 1000000000L / HZ, .ticks = 10000000L, + .close = snd_timer_s_close, .start = snd_timer_s_start, .stop = snd_timer_s_stop }; -- 2.7.0

1 0

[alsa-devel] [PATCH for-4.6] ALSA: dummy: Implement timer backend switching more safely
by Takashi Iwai 02 Feb '16

02 Feb '16

Currently the selected timer backend is referred at any moment from the running PCM callbacks. When the backend is switched, it's possible to lead to inconsistency from the running backend. This was pointed by syzkaller fuzzer, and the commit [7ee96216c31a: ALSA: dummy: Disable switching timer backend via sysfs] disabled the dynamic switching for avoiding the crash. This patch improves the handling of timer backend switching. It keeps the reference to the selected backend during the whole operation of an opened stream so that it won't be changed by other streams. Together with this change, the hrtimer parameter is reenabled as writable now. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- This is a patch for 4.6, not meant for 4.5 as a fix for now. sound/drivers/dummy.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index bde33308f0d6..c0f8f613f1f1 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c @@ -87,7 +87,7 @@ MODULE_PARM_DESC(pcm_substreams, "PCM substreams # (1-128) for dummy driver."); module_param(fake_buffer, bool, 0444); MODULE_PARM_DESC(fake_buffer, "Fake buffer allocations."); #ifdef CONFIG_HIGH_RES_TIMERS -module_param(hrtimer, bool, 0444); +module_param(hrtimer, bool, 0644); MODULE_PARM_DESC(hrtimer, "Use hrtimer as the timer source."); #endif @@ -109,6 +109,9 @@ struct dummy_timer_ops { snd_pcm_uframes_t (*pointer)(struct snd_pcm_substream *); }; +#define get_dummy_ops(substream) \ + (*(const struct dummy_timer_ops **)(substream)->runtime->private_data) + struct dummy_model { const char *name; int (*playback_constraints)(struct snd_pcm_runtime *runtime); @@ -137,7 +140,6 @@ struct snd_dummy { int iobox; struct snd_kcontrol *cd_volume_ctl; struct snd_kcontrol *cd_switch_ctl; - const struct dummy_timer_ops *timer_ops; }; /* @@ -231,6 +233,8 @@ static struct dummy_model *dummy_models[] = { */ struct dummy_systimer_pcm { + /* ops must be the first item */ + const struct dummy_timer_ops *timer_ops; spinlock_t lock; struct timer_list timer; unsigned long base_time; @@ -366,6 +370,8 @@ static const struct dummy_timer_ops dummy_systimer_ops = { */ struct dummy_hrtimer_pcm { + /* ops must be the first item */ + const struct dummy_timer_ops *timer_ops; ktime_t base_time; ktime_t period_time; atomic_t running; @@ -492,31 +498,25 @@ static const struct dummy_timer_ops dummy_hrtimer_ops = { static int dummy_pcm_trigger(struct snd_pcm_substream *substream, int cmd) { - struct snd_dummy *dummy = snd_pcm_substream_chip(substream); - switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: - return dummy->timer_ops->start(substream); + return get_dummy_ops(substream)->start(substream); case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: - return dummy->timer_ops->stop(substream); + return get_dummy_ops(substream)->stop(substream); } return -EINVAL; } static int dummy_pcm_prepare(struct snd_pcm_substream *substream) { - struct snd_dummy *dummy = snd_pcm_substream_chip(substream); - - return dummy->timer_ops->prepare(substream); + return get_dummy_ops(substream)->prepare(substream); } static snd_pcm_uframes_t dummy_pcm_pointer(struct snd_pcm_substream *substream) { - struct snd_dummy *dummy = snd_pcm_substream_chip(substream); - - return dummy->timer_ops->pointer(substream); + return get_dummy_ops(substream)->pointer(substream); } static struct snd_pcm_hardware dummy_pcm_hardware = { @@ -562,17 +562,19 @@ static int dummy_pcm_open(struct snd_pcm_substream *substream) struct snd_dummy *dummy = snd_pcm_substream_chip(substream); struct dummy_model *model = dummy->model; struct snd_pcm_runtime *runtime = substream->runtime; + const struct dummy_timer_ops *ops; int err; - dummy->timer_ops = &dummy_systimer_ops; + ops = &dummy_systimer_ops; #ifdef CONFIG_HIGH_RES_TIMERS if (hrtimer) - dummy->timer_ops = &dummy_hrtimer_ops; + ops = &dummy_hrtimer_ops; #endif - err = dummy->timer_ops->create(substream); + err = ops->create(substream); if (err < 0) return err; + get_dummy_ops(substream) = ops; runtime->hw = dummy->pcm_hw; if (substream->pcm->device & 1) { @@ -594,7 +596,7 @@ static int dummy_pcm_open(struct snd_pcm_substream *substream) err = model->capture_constraints(substream->runtime); } if (err < 0) { - dummy->timer_ops->free(substream); + get_dummy_ops(substream)->free(substream); return err; } return 0; @@ -602,8 +604,7 @@ static int dummy_pcm_open(struct snd_pcm_substream *substream) static int dummy_pcm_close(struct snd_pcm_substream *substream) { - struct snd_dummy *dummy = snd_pcm_substream_chip(substream); - dummy->timer_ops->free(substream); + get_dummy_ops(substream)->free(substream); return 0; } -- 2.7.0

1 0

[alsa-devel] [PATCH] ALSA: hda - chmap supports dynamic pcm assignment
by libin.yang＠linux.intel.com 02 Feb '16

02 Feb '16

From: Libin Yang <libin.yang(a)linux.intel.com> Bind chmap to pcm statically. chmap is now mapped to pin dynamically based on mapping between pcm and pin. Signed-off-by: Libin Yang <libin.yang(a)linux.intel.com> --- sound/pci/hda/patch_hdmi.c | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 275b68a..1a46f45 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -437,6 +437,20 @@ static int hinfo_to_pin_index(struct hda_codec *codec, return -EINVAL; } +static struct hdmi_spec_per_pin *pcm_idx_to_pin(struct hdmi_spec *spec, + int pcm_idx) +{ + int i; + struct hdmi_spec_per_pin *per_pin; + + for (i = 0; i < spec->num_pins; i++) { + per_pin = get_pin(spec, i); + if (per_pin->pcm_idx == pcm_idx) + return per_pin; + } + return NULL; +} + static int cvt_nid_to_cvt_index(struct hda_codec *codec, hda_nid_t cvt_nid) { struct hdmi_spec *spec = codec->spec; @@ -2398,10 +2412,16 @@ static int hdmi_chmap_ctl_get(struct snd_kcontrol *kcontrol, struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol); struct hda_codec *codec = info->private_data; struct hdmi_spec *spec = codec->spec; - int pin_idx = kcontrol->private_value; - struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); + int pcm_idx = kcontrol->private_value; + struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx); int i; + if (!per_pin) { + for (i = 0; i < spec->channels_max; i++) + ucontrol->value.integer.value[i] = 0; + return 0; + } + for (i = 0; i < ARRAY_SIZE(per_pin->chmap); i++) ucontrol->value.integer.value[i] = per_pin->chmap[i]; return 0; @@ -2413,13 +2433,19 @@ static int hdmi_chmap_ctl_put(struct snd_kcontrol *kcontrol, struct snd_pcm_chmap *info = snd_kcontrol_chip(kcontrol); struct hda_codec *codec = info->private_data; struct hdmi_spec *spec = codec->spec; - int pin_idx = kcontrol->private_value; - struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx); + int pcm_idx = kcontrol->private_value; + struct hdmi_spec_per_pin *per_pin = pcm_idx_to_pin(spec, pcm_idx); unsigned int ctl_idx; struct snd_pcm_substream *substream; unsigned char chmap[8]; int i, err, ca, prepared = 0; + /* No monitor is connected in dyn_pcm_assign. + * It's invalid to setup the chmap + */ + if (!per_pin) + return 0; + ctl_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); substream = snd_pcm_chmap_substream(info, ctl_idx); if (!substream || !substream->runtime) @@ -2596,18 +2622,18 @@ static int generic_hdmi_build_controls(struct hda_codec *codec) } /* add channel maps */ - for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) { + for (pcm_idx = 0; pcm_idx < spec->pcm_used; pcm_idx++) { struct hda_pcm *pcm; struct snd_pcm_chmap *chmap; struct snd_kcontrol *kctl; int i; - pcm = get_pcm_rec(spec, pin_idx); + pcm = get_pcm_rec(spec, pcm_idx); if (!pcm || !pcm->pcm) break; err = snd_pcm_add_chmap_ctls(pcm->pcm, SNDRV_PCM_STREAM_PLAYBACK, - NULL, 0, pin_idx, &chmap); + NULL, 0, pcm_idx, &chmap); if (err < 0) return err; /* override handlers */ -- 1.9.1

3 2