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

[alsa-devel] [PATCH v3 0/3] conf: topology: Add the conf for SKL-rt286
by Vinod Koul 22 Apr '16

22 Apr '16

This series adds SKL-i2c conf for simple PCM topology graph Changes in v3: - remove bin blobs, now they are generated in install step - hook the tool compilation to alsa-lib and run it on install - add u8 in alsa type_compat.h Shreyas NC (3): conf: topology: Add Skylake i2s conf Add u8 in type_compat.h conf: topology: Generate Private data binary blobs configure.ac | 2 + include/sound/type_compat.h | 2 + src/conf/topology/Makefile.am | 2 +- src/conf/topology/sklrt286/Makefile.am | 11 + src/conf/topology/sklrt286/data/Makefile.am | 6 + src/conf/topology/sklrt286/data/pvt.c | 1815 ++++++++++++++++++++ src/conf/topology/sklrt286/data/pvt_data.c | 90 + src/conf/topology/sklrt286/data/pvt_local.h | 9 + .../topology/sklrt286/data/skl-tplg-interface.h | 232 +++ src/conf/topology/sklrt286/skl_i2s.conf | 342 ++++ 10 files changed, 2510 insertions(+), 1 deletion(-) create mode 100644 src/conf/topology/sklrt286/Makefile.am create mode 100644 src/conf/topology/sklrt286/data/Makefile.am create mode 100644 src/conf/topology/sklrt286/data/pvt.c create mode 100644 src/conf/topology/sklrt286/data/pvt_data.c create mode 100644 src/conf/topology/sklrt286/data/pvt_local.h create mode 100644 src/conf/topology/sklrt286/data/skl-tplg-interface.h create mode 100644 src/conf/topology/sklrt286/skl_i2s.conf -- 1.9.1

2 13

[alsa-devel] [PATCH v2 0/2] ASoC: Intel: Skylake: Add support for firmware manifest
by Vinod Koul 22 Apr '16

22 Apr '16

In the DSP firmware, module params like module_id and loadable flags can be modified. So, it is required to read these parameters in the driver from the firmware manifest. Changes in v2: - remove strings and use UUID in bin format Shreyas NC (2): ASoC: Intel: Skylake: Use UUID in binary format ASoC: Intel: Skylake: Add DSP firmware manifest parsing sound/soc/intel/skylake/Makefile | 2 +- sound/soc/intel/skylake/skl-dsp-parse.c | 105 ++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-dsp-parse.h | 107 +++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-sst-dsp.h | 2 +- sound/soc/intel/skylake/skl-sst-ipc.h | 4 + sound/soc/intel/skylake/skl-sst.c | 20 ++++- sound/soc/intel/skylake/skl-topology.c | 11 ++- sound/soc/intel/skylake/skl-topology.h | 2 +- sound/soc/intel/skylake/skl-tplg-interface.h | 2 +- 9 files changed, 243 insertions(+), 12 deletions(-) create mode 100644 sound/soc/intel/skylake/skl-dsp-parse.c create mode 100644 sound/soc/intel/skylake/skl-dsp-parse.h -- 1.9.1

2 5

[alsa-devel] A&H Zed R16 not completely working (DICE Jr)
by Allan Klinbail 21 Apr '16

21 Apr '16

Hi, I thought I would try the DICE chipset driver from ALSA, as it appears that this will eventually take over from ffado.. It appears that it doesn't work very well for my Allen & Heath Zed -R16 which works very well under FFADO Using kernel 4.4.0 from Ubuntu The ALSA driver limited the device to only 16 inputs and outputs, however it has a total capability of 26 This is comprises of 16 inputs and outputs on the desk channels, a stereo main pair of outputs and inputs for the master bus 8 additional ins and outs to support the ADAT ports on the back (availoable in 44.1 and 48 khz modes, but not 88.2 or 96 Khz Similiarly I was not able to set the device to run at a latency lower than 256 frames in jack, however in FFADO I could go as low as 64 frames. Please let me know if I can help with any further testing to get this to the same level as the FFADO driver. Regards Allan

2 11

[alsa-devel] [PATCH v6 00/10] ASoC: Add mediatek HDMI codec support
by Philipp Zabel 21 Apr '16

21 Apr '16

these patches add an interface for Jyri's generic hdmi-codec driver [1] to the mediatek hdmi bridge driver. This version fixes the hdmi-codec notification patch and splits the jack support out of the ASoC machine driver patches. Changes since v5: - select SND_SOC_HDMI_CODEC and HDMI_NOTIFIERS where appropriate - split out jack support from machine driver patches - fix include of hdmi-notifier.h in hdmi-codec notification support - Drop applied patch: commit 05f5afd3f0d9 ("ASoC: mediatek: address dai link array entries by enum") The mediatek drm patches apply on top of https://patchwork.kernel.org/patch/8534251/ ("drm/mediatek: Add HDMI support"), and need this patch: [2] https://patchwork.kernel.org/patch/8091531/ ("video: hdmi: add helper function for N and CTS") The asoc patches depend on these two patches: https://patchwork.kernel.org/patch/7215121/ ("ALSA: pcm: add IEC958 channel status helper for hw_params") [1] https://patchwork.kernel.org/patch/7215271/ ("ASoC: hdmi-codec: Add hdmi-codec for external HDMI-encoders") regards Philipp Koro Chen (1): ASoC: mediatek: Add HDMI dai-links in the mt8173-rt5650-rt5676 machine driver PC Liao (1): ASoC: mediatek: Add HDMI dai-links to the mt8173-rt5650 machine driver Philipp Zabel (8): drm/mediatek: hdmi: Add audio interface to the hdmi-codec driver video: rmk's HDMI notification prototype drm/mediatek: hdmi: issue notifications ASoC: hdmi-codec: Use HDMI notifications to add jack support ASoC: hdmi-codec: Add ELD control drm/mediatek: hdmi: use helper function for N and CTS calculation ASoC: mediatek: Add jack detection support to mt8173-rt5650-rt5676 machine driver ASoC: mediatek: Add jack detection support to the mt8173-rt5650 machine driver .../bindings/sound/mt8173-rt5650-rt5676.txt | 5 +- .../devicetree/bindings/sound/mt8173-rt5650.txt | 5 +- drivers/gpu/drm/mediatek/Kconfig | 1 + drivers/gpu/drm/mediatek/mtk_cec.c | 11 ++ drivers/gpu/drm/mediatek/mtk_drm_hdmi_drv.c | 148 +++++++++++++++++ drivers/gpu/drm/mediatek/mtk_hdmi.c | 89 +++++----- drivers/gpu/drm/mediatek/mtk_hdmi.h | 10 +- drivers/gpu/drm/mediatek/mtk_hdmi_hw.c | 179 ++++----------------- drivers/gpu/drm/mediatek/mtk_hdmi_hw.h | 4 +- drivers/video/Kconfig | 3 + drivers/video/Makefile | 1 + drivers/video/hdmi-notifier.c | 61 +++++++ include/linux/hdmi-notifier.h | 44 +++++ include/sound/hdmi-codec.h | 6 + sound/soc/codecs/Kconfig | 1 + sound/soc/codecs/hdmi-codec.c | 123 +++++++++++++- sound/soc/mediatek/Kconfig | 2 + sound/soc/mediatek/mt8173-rt5650-rt5676.c | 48 ++++++ sound/soc/mediatek/mt8173-rt5650.c | 47 ++++++ 19 files changed, 576 insertions(+), 212 deletions(-) create mode 100644 drivers/video/hdmi-notifier.c create mode 100644 include/linux/hdmi-notifier.h -- 2.7.0

2 11

[alsa-devel] [PATCH 0/2] ASoC: tlv320aic32x4: Better model the input mixers
by Jeremy McDermond 21 Apr '16

21 Apr '16

The input mixers have resistors on all the input lines as well as an additional line that crosses between right and left pins. This patch enables those routings within the driver to provide more flexibility for different board configurations. These settings are documented on pages 135 and 136 of TI's SLAA557 document available at http://www.ti.com/lit/ml/slaa557/slaa557.pdf. This patch might introduce some breakage for current users because it changes some mixer routing settings from a straight switch to an enum for the different resistor values instead. I'm not sure there's anything we can do in code to mitigate these effects, but am open to requests for changes if there's something I'm not aware of. Jeremy McDermond (2): ASoC: tlv320aic32x4: Implement resistors on input pins ASoC: tlv320aic32x4: Add additional input pins sound/soc/codecs/tlv320aic32x4.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) -- 2.5.0

2 4

[alsa-devel] [PATCH] ASoC: arizona: Prefer lower FRATIO in pseudo-fractional mode
by Richard Fitzgerald 21 Apr '16

21 Apr '16

When setting up an FLL in pseudo-fractional mode it is preferred to use a lower FRATIO if possible to give a higher reference clock frequency. This patch swaps the two loops in arizona_calc_fratio() so that lower FRATIOs are tried first. The decrementing loop is also changed to start from init_ratio because the original settings might already give a fractional value for N.K Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/arizona.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 0cd27e0..d1e1127 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c @@ -2039,7 +2039,21 @@ static int arizona_calc_fratio(struct arizona_fll *fll, init_ratio, Fref, refdiv); while (div <= ARIZONA_FLL_MAX_REFDIV) { - for (ratio = init_ratio; ratio <= ARIZONA_FLL_MAX_FRATIO; + /* start from init_ratio because this may already give a + * fractional N.K + */ + for (ratio = init_ratio; ratio > 0; ratio--) { + if (target % (ratio * Fref)) { + cfg->refdiv = refdiv; + cfg->fratio = ratio - 1; + arizona_fll_dbg(fll, + "pseudo: found fref=%u refdiv=%d(%d) ratio=%d\n", + Fref, refdiv, div, ratio); + return ratio; + } + } + + for (ratio = init_ratio + 1; ratio <= ARIZONA_FLL_MAX_FRATIO; ratio++) { if ((ARIZONA_FLL_VCO_CORNER / 2) / (fll->vco_mult * ratio) < Fref) { @@ -2065,17 +2079,6 @@ static int arizona_calc_fratio(struct arizona_fll *fll, } } - for (ratio = init_ratio - 1; ratio > 0; ratio--) { - if (target % (ratio * Fref)) { - cfg->refdiv = refdiv; - cfg->fratio = ratio - 1; - arizona_fll_dbg(fll, - "pseudo: found fref=%u refdiv=%d(%d) ratio=%d\n", - Fref, refdiv, div, ratio); - return ratio; - } - } - div *= 2; Fref /= 2; refdiv++; -- 1.9.1

2 1

[alsa-devel] [PATCH v8] ASoC: mediatek: Add second I2S on mt8173-rt5650 machine driver
by PC Liao 21 Apr '16

21 Apr '16

This patch adds second I2S connection to rt5650 codec for capture path on mt8173-rt5650 machine driver. Signed-off-by: PC Liao <pc.liao(a)mediatek.com> --- Changes since v7: Change the code for compatibility Changes since v6: Use subnode to determine the capture path --- .../devicetree/bindings/sound/mt8173-rt5650.txt | 10 ++++ sound/soc/mediatek/mt8173-rt5650.c | 50 ++++++++++++++++++-- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt index fe5a5ef..5bfa6b6 100644 --- a/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt +++ b/Documentation/devicetree/bindings/sound/mt8173-rt5650.txt @@ -5,11 +5,21 @@ Required properties: - mediatek,audio-codec: the phandles of rt5650 codecs - mediatek,platform: the phandle of MT8173 ASoC platform +Optional subnodes: +- codec-capture : the subnode of rt5650 codec capture +Required codec-capture subnode properties: +- sound-dai: audio codec dai name on capture path + <&rt5650 0> : Default setting. Connect rt5650 I2S1 for capture. (dai_name = rt5645-aif1) + <&rt5650 1> : Connect rt5650 I2S2 for capture. (dai_name = rt5645-aif2) + Example: sound { compatible = "mediatek,mt8173-rt5650"; mediatek,audio-codec = <&rt5650>; mediatek,platform = <&afe>; + codec-capture { + sound-dai = <&rt5650 1>; + }; }; diff --git a/sound/soc/mediatek/mt8173-rt5650.c b/sound/soc/mediatek/mt8173-rt5650.c index bb09bb1..a27a667 100644 --- a/sound/soc/mediatek/mt8173-rt5650.c +++ b/sound/soc/mediatek/mt8173-rt5650.c @@ -85,12 +85,29 @@ static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime) { struct snd_soc_card *card = runtime->card; struct snd_soc_codec *codec = runtime->codec_dais[0]->codec; + const char *codec_capture_dai = runtime->codec_dais[1]->name; int ret; rt5645_sel_asrc_clk_src(codec, - RT5645_DA_STEREO_FILTER | - RT5645_AD_STEREO_FILTER, + RT5645_DA_STEREO_FILTER, RT5645_CLK_SEL_I2S1_ASRC); + + if (!strcmp(codec_capture_dai, "rt5645-aif1")) { + rt5645_sel_asrc_clk_src(codec, + RT5645_AD_STEREO_FILTER, + RT5645_CLK_SEL_I2S1_ASRC); + } else if (!strcmp(codec_capture_dai, "rt5645-aif2")) { + rt5645_sel_asrc_clk_src(codec, + RT5645_AD_STEREO_FILTER, + RT5645_CLK_SEL_I2S2_ASRC); + } else { + dev_warn(card->dev, + "Only one dai codec found in DTS, enabled rt5645 AD filter\n"); + rt5645_sel_asrc_clk_src(codec, + RT5645_AD_STEREO_FILTER, + RT5645_CLK_SEL_I2S1_ASRC); + } + /* enable jack detection */ ret = snd_soc_card_jack_new(card, "Headset Jack", SND_JACK_HEADPHONE | SND_JACK_MICROPHONE | @@ -110,6 +127,11 @@ static int mt8173_rt5650_init(struct snd_soc_pcm_runtime *runtime) static struct snd_soc_dai_link_component mt8173_rt5650_codecs[] = { { + /* Playback */ + .dai_name = "rt5645-aif1", + }, + { + /* Capture */ .dai_name = "rt5645-aif1", }, }; @@ -149,7 +171,7 @@ static struct snd_soc_dai_link mt8173_rt5650_dais[] = { .cpu_dai_name = "I2S", .no_pcm = 1, .codecs = mt8173_rt5650_codecs, - .num_codecs = 1, + .num_codecs = 2, .init = mt8173_rt5650_init, .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBS_CFS, @@ -177,6 +199,8 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) { struct snd_soc_card *card = &mt8173_rt5650_card; struct device_node *platform_node; + struct device_node *np; + const char *codec_capture_dai; int i, ret; platform_node = of_parse_phandle(pdev->dev.of_node, @@ -199,6 +223,26 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) "Property 'audio-codec' missing or invalid\n"); return -EINVAL; } + mt8173_rt5650_codecs[1].of_node = mt8173_rt5650_codecs[0].of_node; + + if (of_find_node_by_name(platform_node, "codec-capture")) { + np = of_get_child_by_name(pdev->dev.of_node, "codec-capture"); + if (!np) { + dev_err(&pdev->dev, + "%s: Can't find codec-capture DT node\n", + __func__); + return -EINVAL; + } + ret = snd_soc_of_get_dai_name(np, &codec_capture_dai); + if (ret < 0) { + dev_err(&pdev->dev, + "%s codec_capture_dai name fail %d\n", + __func__, ret); + return ret; + } + mt8173_rt5650_codecs[1].dai_name = codec_capture_dai; + } + card->dev = &pdev->dev; platform_set_drvdata(pdev, card); -- 1.7.9.5

2 1

[alsa-devel] [sound:topic/hdmi 34/34] include/sound/hda_i915.h:29:1: error: expected identifier or '(' before '{' token
by kbuild test robot 21 Apr '16

21 Apr '16

tree: https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git topic/hdmi head: e8de8fa72b640de1e30dcf62bab1a7b012d48cc2 commit: e8de8fa72b640de1e30dcf62bab1a7b012d48cc2 [34/34] ALSA: hda - Move i915 HSW/BDW BCLK setup to a common function config: i386-randconfig-i0-201616 (attached as .config) reproduce: git checkout e8de8fa72b640de1e30dcf62bab1a7b012d48cc2 # save the attached .config to linux build tree make ARCH=i386 All error/warnings (new ones prefixed by >>): In file included from sound/pci/hda/patch_hdmi.c:41:0: >> include/sound/hda_i915.h:29:1: error: expected identifier or '(' before '{' token { ^ >> include/sound/hda_i915.h:28:20: warning: 'snd_hdac_i915_set_bclk' used but never defined static inline void snd_hdac_i915_set_bclk(struct hdac_bus *bus); ^ vim +29 include/sound/hda_i915.h 98d8fc6c Mengdong Lin 2015-05-19 22 return 0; 98d8fc6c Mengdong Lin 2015-05-19 23 } 98d8fc6c Mengdong Lin 2015-05-19 24 static inline int snd_hdac_display_power(struct hdac_bus *bus, bool enable) 98d8fc6c Mengdong Lin 2015-05-19 25 { 98d8fc6c Mengdong Lin 2015-05-19 26 return 0; 98d8fc6c Mengdong Lin 2015-05-19 27 } e8de8fa7 Takashi Iwai 2016-04-21 @28 static inline void snd_hdac_i915_set_bclk(struct hdac_bus *bus); 98d8fc6c Mengdong Lin 2015-05-19 @29 { 98d8fc6c Mengdong Lin 2015-05-19 30 } d745f5e7 Takashi Iwai 2016-03-21 31 static inline int snd_hdac_sync_audio_rate(struct hdac_device *codec, d745f5e7 Takashi Iwai 2016-03-21 32 hda_nid_t nid, int rate) :::::: The code at line 29 was first introduced by commit :::::: 98d8fc6c5d3652e91c61d78941e0fa6f94771d67 ALSA: hda - Move hda_i915.c from sound/pci/hda to sound/hda :::::: TO: Mengdong Lin <mengdong.lin(a)intel.com> :::::: CC: Takashi Iwai <tiwai(a)suse.de> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH] ALSA: hda - Fix possible race on regmap bypass flip
by Takashi Iwai 21 Apr '16

21 Apr '16

HD-audio driver uses regmap cache bypass feature for reading a raw value without the cache. But this is racy since both the cached and the uncached reads may occur concurrently. The former is done via the normal control API access while the latter comes from the proc file read. Even though the regmap itself has the protection against the concurrent accesses, the flag set/reset is done without the protection, so it may lead to inconsistent state of bypass flag that doesn't match with the current read and occasionally result in a kernel WARNING like: WARNING: CPU: 3 PID: 2731 at drivers/base/regmap/regcache.c:499 regcache_cache_only+0x78/0x93 One way to work around such a problem is to wrap with a mutex. But in this case, the solution is simpler: for the uncached read, we just skip the regmap and directly calls its accessor. The verb execution there is protected by itself, so basically it's safe to call individually. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=116171 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/hda_regmap.h | 2 ++ sound/hda/hdac_device.c | 10 ++++------ sound/hda/hdac_regmap.c | 40 ++++++++++++++++++++++++++++------------ 3 files changed, 34 insertions(+), 18 deletions(-) diff --git a/include/sound/hda_regmap.h b/include/sound/hda_regmap.h index 2767c55a641e..ca64f0f50b45 100644 --- a/include/sound/hda_regmap.h +++ b/include/sound/hda_regmap.h @@ -17,6 +17,8 @@ int snd_hdac_regmap_add_vendor_verb(struct hdac_device *codec, unsigned int verb); int snd_hdac_regmap_read_raw(struct hdac_device *codec, unsigned int reg, unsigned int *val); +int snd_hdac_regmap_read_raw_uncached(struct hdac_device *codec, + unsigned int reg, unsigned int *val); int snd_hdac_regmap_write_raw(struct hdac_device *codec, unsigned int reg, unsigned int val); int snd_hdac_regmap_update_raw(struct hdac_device *codec, unsigned int reg, diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c index d1a4d6973330..03c9872c31cf 100644 --- a/sound/hda/hdac_device.c +++ b/sound/hda/hdac_device.c @@ -299,13 +299,11 @@ EXPORT_SYMBOL_GPL(_snd_hdac_read_parm); int snd_hdac_read_parm_uncached(struct hdac_device *codec, hda_nid_t nid, int parm) { - int val; + unsigned int cmd, val; - if (codec->regmap) - regcache_cache_bypass(codec->regmap, true); - val = snd_hdac_read_parm(codec, nid, parm); - if (codec->regmap) - regcache_cache_bypass(codec->regmap, false); + cmd = snd_hdac_regmap_encode_verb(nid, AC_VERB_PARAMETERS) | parm; + if (snd_hdac_regmap_read_raw_uncached(codec, cmd, &val) < 0) + return -1; return val; } EXPORT_SYMBOL_GPL(snd_hdac_read_parm_uncached); diff --git a/sound/hda/hdac_regmap.c b/sound/hda/hdac_regmap.c index bdbcd6b75ff6..87041ddd29cb 100644 --- a/sound/hda/hdac_regmap.c +++ b/sound/hda/hdac_regmap.c @@ -453,14 +453,30 @@ int snd_hdac_regmap_write_raw(struct hdac_device *codec, unsigned int reg, EXPORT_SYMBOL_GPL(snd_hdac_regmap_write_raw); static int reg_raw_read(struct hdac_device *codec, unsigned int reg, - unsigned int *val) + unsigned int *val, bool uncached) { - if (!codec->regmap) + if (uncached || !codec->regmap) return hda_reg_read(codec, reg, val); else return regmap_read(codec->regmap, reg, val); } +static int __snd_hdac_regmap_read_raw(struct hdac_device *codec, + unsigned int reg, unsigned int *val, + bool uncached) +{ + int err; + + err = reg_raw_read(codec, reg, val, uncached); + if (err == -EAGAIN) { + err = snd_hdac_power_up_pm(codec); + if (!err) + err = reg_raw_read(codec, reg, val, uncached); + snd_hdac_power_down_pm(codec); + } + return err; +} + /** * snd_hdac_regmap_read_raw - read a pseudo register with power mgmt * @codec: the codec object @@ -472,19 +488,19 @@ static int reg_raw_read(struct hdac_device *codec, unsigned int reg, int snd_hdac_regmap_read_raw(struct hdac_device *codec, unsigned int reg, unsigned int *val) { - int err; - - err = reg_raw_read(codec, reg, val); - if (err == -EAGAIN) { - err = snd_hdac_power_up_pm(codec); - if (!err) - err = reg_raw_read(codec, reg, val); - snd_hdac_power_down_pm(codec); - } - return err; + return __snd_hdac_regmap_read_raw(codec, reg, val, false); } EXPORT_SYMBOL_GPL(snd_hdac_regmap_read_raw); +/* Works like snd_hdac_regmap_read_raw(), but this doesn't read from the + * cache but always via hda verbs. + */ +int snd_hdac_regmap_read_raw_uncached(struct hdac_device *codec, + unsigned int reg, unsigned int *val) +{ + return __snd_hdac_regmap_read_raw(codec, reg, val, true); +} + /** * snd_hdac_regmap_update_raw - update a pseudo register with power mgmt * @codec: the codec object -- 2.8.1

1 0

[alsa-devel] [PATCH] ALSA: pcxhr: Fix missing mutex unlock
by Takashi Iwai 21 Apr '16

21 Apr '16

The commit [9bef72bdb26e: ALSA: pcxhr: Use nonatomic PCM ops] converted to non-atomic PCM ops, but shamelessly with an unbalanced mutex locking, which leads to the hangup easily. Fix it. Fixes: 9bef72bdb26e ('ALSA: pcxhr: Use nonatomic PCM ops') Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=116441 Cc: <stable(a)vger.kernel.org> # 3.18+ Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/pcxhr/pcxhr_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/pcxhr/pcxhr_core.c b/sound/pci/pcxhr/pcxhr_core.c index c5194f5b150a..d7e71f309299 100644 --- a/sound/pci/pcxhr/pcxhr_core.c +++ b/sound/pci/pcxhr/pcxhr_core.c @@ -1341,5 +1341,6 @@ irqreturn_t pcxhr_threaded_irq(int irq, void *dev_id) } pcxhr_msg_thread(mgr); + mutex_unlock(&mgr->lock); return IRQ_HANDLED; } -- 2.8.1

1 0