August 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 2/3] input: Add SW_UNSUPPORT_INSERT define
by bgoswami＠codeaurora.org 22 Aug '19

22 Aug '19

From: Banajit Goswami <bgoswami(a)codeaurora.org> Some devices may not support specific type of input devices. For example, when a headset or extension cable with GND/MIC swap is plugged into a headset jack that does not support the headset/cable, it needs to be reported with a corresponding input event. Also, increase the max values for INPUT_DEVICE_ID_SW_MAX and SW_MAX, to accommodate future extension of the number of event. Signed-off-by: Gopikrishnaiah Anandan <agopik(a)codeaurora.org> Signed-off-by: Banajit Goswami <bgoswami(a)codeaurora.org> --- include/linux/mod_devicetable.h | 2 +- include/uapi/linux/input-event-codes.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 448621c..7586099 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -299,7 +299,7 @@ struct pcmcia_device_id { #define INPUT_DEVICE_ID_LED_MAX 0x0f #define INPUT_DEVICE_ID_SND_MAX 0x07 #define INPUT_DEVICE_ID_FF_MAX 0x7f -#define INPUT_DEVICE_ID_SW_MAX 0x0f +#define INPUT_DEVICE_ID_SW_MAX 0x1f #define INPUT_DEVICE_ID_PROP_MAX 0x1f #define INPUT_DEVICE_ID_MATCH_BUS 1 diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index 85387c7..960fa86 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -808,7 +808,8 @@ #define SW_LINEIN_INSERT 0x0d /* set = inserted */ #define SW_MUTE_DEVICE 0x0e /* set = device disabled */ #define SW_PEN_INSERTED 0x0f /* set = pen inserted */ -#define SW_MAX 0x0f +#define SW_UNSUPPORT_INSERT 0x10 /* set = unsupported device inserted */ +#define SW_MAX 0x1f #define SW_CNT (SW_MAX+1) /* -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

2 1

[alsa-devel] [PATCH v3 0/4] ASoC: codecs: Add WSA881x Smart Speaker amplifier support
by Srinivas Kandagatla 22 Aug '19

22 Aug '19

Thanks for reviewing v2 patchset, here is v3 with addressing the comments in v2. This patchset adds support to WSA8810/WSA8815 Class-D Smart Speaker Amplifier which is SoundWire interfaced. This also adds support to some missing bits in SoundWire bus layer like Device Tree support. This patchset along with DB845c machine driver and WCD934x codec driver has been tested on SDM845 SoC based DragonBoard DB845c with two WSA8810 speakers. Most of the code in this driver is rework of Qualcomm downstream drivers used in Andriod. Credits to Banajit Goswami and Patrick Lai's Team. TODO: Add thermal sensor support in WSA881x. Thanks, srini Changes since v2: - Updated compatible string to include LinkID. - udpdated wsa driver to not register/unregister component in SoundWire status callbacks. - Updated few minor coding style review comments. Changes since v1 RFC: - bindings document renamed to slave.txt - fix error code from dt slave parsing Srinivas Kandagatla (4): dt-bindings: soundwire: add slave bindings soundwire: core: add device tree support for slave devices dt-bindings: ASoC: Add WSA881x bindings ASoC: codecs: add wsa881x amplifier support .../bindings/sound/qcom,wsa881x.txt | 24 + .../devicetree/bindings/soundwire/slave.txt | 51 + drivers/soundwire/bus.c | 2 + drivers/soundwire/bus.h | 1 + drivers/soundwire/slave.c | 44 + sound/soc/codecs/Kconfig | 10 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/wsa881x.c | 1134 +++++++++++++++++ 8 files changed, 1268 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/qcom,wsa881x.txt create mode 100644 Documentation/devicetree/bindings/soundwire/slave.txt create mode 100644 sound/soc/codecs/wsa881x.c -- 2.21.0

4 14

[alsa-devel] [PATCH -next] ALSA: line6: Fix -Wunused-const-variable warnings
by YueHaibing 22 Aug '19

22 Aug '19

sound/usb/line6/driver.h:69:18: warning: SYSEX_DATA_OFS defined but not used [-Wunused-const-variable=] sound/usb/line6/driver.h:70:18: warning: SYSEX_EXTRA_SIZE defined but not used [-Wunused-const-variable=] SYSEX_EXTRA_SIZE is only used in driver.c and SYSEX_DATA_OFS in pod.c, so move them to .c fix this warning. Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/usb/line6/driver.c | 2 ++ sound/usb/line6/driver.h | 3 --- sound/usb/line6/pod.c | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index b5a3f75..8027da8 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c @@ -31,6 +31,8 @@ const unsigned char line6_midi_id[3] = { }; EXPORT_SYMBOL_GPL(line6_midi_id); +static const int SYSEX_EXTRA_SIZE = sizeof(line6_midi_id) + 4; + /* Code to request version of POD, Variax interface (and maybe other devices). diff --git a/sound/usb/line6/driver.h b/sound/usb/line6/driver.h index e5e572e..c57633a 100644 --- a/sound/usb/line6/driver.h +++ b/sound/usb/line6/driver.h @@ -66,9 +66,6 @@ extern const unsigned char line6_midi_id[3]; -static const int SYSEX_DATA_OFS = sizeof(line6_midi_id) + 3; -static const int SYSEX_EXTRA_SIZE = sizeof(line6_midi_id) + 4; - /* Common properties of Line 6 devices. */ diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c index ee4c9d2..24ad337 100644 --- a/sound/usb/line6/pod.c +++ b/sound/usb/line6/pod.c @@ -110,6 +110,8 @@ enum { POD_BUSY_MIDISEND }; +static const int SYSEX_DATA_OFS = sizeof(line6_midi_id) + 3; + static struct snd_ratden pod_ratden = { .num_min = 78125, .num_max = 78125, -- 2.7.4

2 1

[alsa-devel] KASAN: use-after-free Read in snd_seq_ioctl_get_client_pool
by syzbot 22 Aug '19

22 Aug '19

Hello, syzbot found the following crash on: HEAD commit: d1abaeb3 Linux 5.3-rc5 git tree: upstream console output: https://syzkaller.appspot.com/x/log.txt?x=15b5add2600000 kernel config: https://syzkaller.appspot.com/x/.config?x=f7242b2607d5d53a dashboard link: https://syzkaller.appspot.com/bug?extid=4a75454b9ca2777f35c7 compiler: clang version 9.0.0 (/home/glider/llvm/clang 80fee25776c2fb61e74c1ecb1a523375c2500b69) Unfortunately, I don't have any reproducer for this crash yet. IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+4a75454b9ca2777f35c7(a)syzkaller.appspotmail.com ================================================================== BUG: KASAN: use-after-free in atomic_read include/asm-generic/atomic-instrumented.h:26 [inline] BUG: KASAN: use-after-free in snd_seq_unused_cells sound/core/seq/seq_memory.h:60 [inline] BUG: KASAN: use-after-free in snd_seq_ioctl_get_client_pool+0x2e0/0x680 sound/core/seq/seq_clientmgr.c:1839 Read of size 4 at addr ffff8880a8e27b14 by task syz-executor.5/31741 CPU: 0 PID: 31741 Comm: syz-executor.5 Not tainted 5.3.0-rc5 #82 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:77 [inline] dump_stack+0x1d8/0x2f8 lib/dump_stack.c:113 print_address_description+0x75/0x5b0 mm/kasan/report.c:351 __kasan_report+0x14b/0x1c0 mm/kasan/report.c:482 kasan_report+0x26/0x50 mm/kasan/common.c:612 check_memory_region_inline mm/kasan/generic.c:182 [inline] check_memory_region+0x2cf/0x2e0 mm/kasan/generic.c:192 __kasan_check_read+0x11/0x20 mm/kasan/common.c:92 atomic_read include/asm-generic/atomic-instrumented.h:26 [inline] snd_seq_unused_cells sound/core/seq/seq_memory.h:60 [inline] snd_seq_ioctl_get_client_pool+0x2e0/0x680 sound/core/seq/seq_clientmgr.c:1839 snd_seq_ioctl+0x1d1/0x340 sound/core/seq/seq_clientmgr.c:2158 do_vfs_ioctl+0x744/0x1730 fs/ioctl.c:46 ksys_ioctl fs/ioctl.c:713 [inline] __do_sys_ioctl fs/ioctl.c:720 [inline] __se_sys_ioctl fs/ioctl.c:718 [inline] __x64_sys_ioctl+0xe3/0x120 fs/ioctl.c:718 do_syscall_64+0xfe/0x140 arch/x86/entry/common.c:296 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x459829 Code: fd b7 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 cb b7 fb ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007faf5e0c4c78 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 0000000000459829 RDX: 00000000200003c0 RSI: 00000000c058534b RDI: 0000000000000003 RBP: 000000000075bf20 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007faf5e0c56d4 R13: 00000000004cdc18 R14: 00000000004d7ba8 R15: 00000000ffffffff Allocated by task 31737: save_stack mm/kasan/common.c:69 [inline] set_track mm/kasan/common.c:77 [inline] __kasan_kmalloc+0x11c/0x1b0 mm/kasan/common.c:487 kasan_kmalloc+0x9/0x10 mm/kasan/common.c:501 kmem_cache_alloc_trace+0x221/0x2f0 mm/slab.c:3550 kmalloc include/linux/slab.h:552 [inline] kzalloc include/linux/slab.h:748 [inline] snd_seq_pool_new+0x53/0x1b0 sound/core/seq/seq_memory.c:459 snd_seq_fifo_new+0x72/0x1c0 sound/core/seq/seq_fifo.c:26 snd_seq_open+0x1e4/0x470 sound/core/seq/seq_clientmgr.c:350 snd_open+0x313/0x380 sound/core/sound.c:163 chrdev_open+0x509/0x590 fs/char_dev.c:414 do_dentry_open+0x73b/0xf90 fs/open.c:797 vfs_open+0x73/0x80 fs/open.c:906 do_last fs/namei.c:3416 [inline] path_openat+0x1397/0x4460 fs/namei.c:3533 do_filp_open+0x192/0x3d0 fs/namei.c:3563 do_sys_open+0x29f/0x560 fs/open.c:1089 __do_sys_open fs/open.c:1107 [inline] __se_sys_open fs/open.c:1102 [inline] __x64_sys_open+0x87/0x90 fs/open.c:1102 do_syscall_64+0xfe/0x140 arch/x86/entry/common.c:296 entry_SYSCALL_64_after_hwframe+0x49/0xbe Freed by task 31737: save_stack mm/kasan/common.c:69 [inline] set_track mm/kasan/common.c:77 [inline] __kasan_slab_free+0x12a/0x1e0 mm/kasan/common.c:449 kasan_slab_free+0xe/0x10 mm/kasan/common.c:457 __cache_free mm/slab.c:3425 [inline] kfree+0x115/0x200 mm/slab.c:3756 snd_seq_pool_delete+0x9e/0xd0 sound/core/seq/seq_memory.c:487 snd_seq_fifo_resize+0x1de/0x250 sound/core/seq/seq_fifo.c:262 snd_seq_ioctl_set_client_pool+0x3c4/0x740 sound/core/seq/seq_clientmgr.c:1880 snd_seq_ioctl+0x1d1/0x340 sound/core/seq/seq_clientmgr.c:2158 do_vfs_ioctl+0x744/0x1730 fs/ioctl.c:46 ksys_ioctl fs/ioctl.c:713 [inline] __do_sys_ioctl fs/ioctl.c:720 [inline] __se_sys_ioctl fs/ioctl.c:718 [inline] __x64_sys_ioctl+0xe3/0x120 fs/ioctl.c:718 do_syscall_64+0xfe/0x140 arch/x86/entry/common.c:296 entry_SYSCALL_64_after_hwframe+0x49/0xbe The buggy address belongs to the object at ffff8880a8e27b00 which belongs to the cache kmalloc-192 of size 192 The buggy address is located 20 bytes inside of 192-byte region [ffff8880a8e27b00, ffff8880a8e27bc0) The buggy address belongs to the page: page:ffffea0002a389c0 refcount:1 mapcount:0 mapping:ffff8880aa400000 index:0x0 flags: 0x1fffc0000000200(slab) raw: 01fffc0000000200 ffffea00026d1008 ffffea0002870048 ffff8880aa400000 raw: 0000000000000000 ffff8880a8e27000 0000000100000010 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff8880a8e27a00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff8880a8e27a80: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc > ffff8880a8e27b00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff8880a8e27b80: fb fb fb fb fb fb fb fb fc fc fc fc fc fc fc fc ffff8880a8e27c00: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ================================================================== --- This bug is generated by a bot. It may contain errors. See https://goo.gl/tpsmEJ for more information about syzbot. syzbot engineers can be reached at syzkaller(a)googlegroups.com. syzbot will keep track of this bug report. See: https://goo.gl/tpsmEJ#status for how to communicate with syzbot.

1 0

[alsa-devel] [PATCH -next] ASoC: sun4i-i2s: Use PTR_ERR_OR_ZERO in sun4i_i2s_init_regmap_fields()
by YueHaibing 22 Aug '19

22 Aug '19

Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/sunxi/sun4i-i2s.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index 9e691baee1e8..2071c54265f3 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -1095,10 +1095,7 @@ static int sun4i_i2s_init_regmap_fields(struct device *dev, i2s->field_fmt_sr = devm_regmap_field_alloc(dev, i2s->regmap, i2s->variant->field_fmt_sr); - if (IS_ERR(i2s->field_fmt_sr)) - return PTR_ERR(i2s->field_fmt_sr); - - return 0; + return PTR_ERR_OR_ZERO(i2s->field_fmt_sr); } static int sun4i_i2s_probe(struct platform_device *pdev)

3 3

[alsa-devel] What to do when a device clears the buffer in the start trigger?
by Paul Pawlowski 22 Aug '19

22 Aug '19

Hello, I have a device which clears the DMA buffer when I command it to start the playback. How can this be workarounded? I found the SNDRV_PCM_INFO_DOUBLE flag, but it doesn't seem that it changes alsa/alsa-lib behaviour. I wasn't able to find any drivers which shared this quirk. I'd like to avoid double buffering if possible, as once the stream is actually started it's not required. Thank you, Paul Pawlowski

2 3

[alsa-devel] [PATCH] ALSA: usb-audio: Fix the mixer control range limiting issue
by Srinivas Kandagatla 22 Aug '19

22 Aug '19

From: Deepa Madiregama <dmadireg(a)codeaurora.org> - mixer_ctl_set() function is limiting the volume level to particular range. This results in incorrect initial volume setting for that device. - In USB mixer while calculating the dBmin/dBmax values resolution factor is hardcoded to 256 which results in populating the wrong values for dBmin/dBmax. - Fix is to use appropriate resolution factor while calculating the dBmin/dBmax values. Signed-off-by: Deepa Madiregama <dmadireg(a)codeaurora.org> Signed-off-by: Banajit Goswami <bgoswami(a)codeaurora.org> Signed-off-by: Meng Wang <mwang(a)codeaurora.org> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/usb/mixer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 5070a6a76ab3..a67448327d07 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -1248,8 +1248,10 @@ static int get_min_max_with_quirks(struct usb_mixer_elem_info *cval, /* USB descriptions contain the dB scale in 1/256 dB unit * while ALSA TLV contains in 1/100 dB unit */ - cval->dBmin = (convert_signed_value(cval, cval->min) * 100) / 256; - cval->dBmax = (convert_signed_value(cval, cval->max) * 100) / 256; + cval->dBmin = + (convert_signed_value(cval, cval->min) * 100) / (cval->res); + cval->dBmax = + (convert_signed_value(cval, cval->max) * 100) / (cval->res); if (cval->dBmin > cval->dBmax) { /* something is wrong; assume it's either from/to 0dB */ if (cval->dBmin < 0) -- 2.21.0

2 2

[alsa-devel] [PATCH] ALSA: pcm: add support for 352.8KHz and 384KHz sample rate
by Srinivas Kandagatla 22 Aug '19

22 Aug '19

From: Vidyakumar Athota <vathota(a)codeaurora.org> Most of the modern codecs supports 352.8KHz and 384KHz sample rates. Currently HW params fails to set 352.8Kz and 384KHz sample rate as these are not in known rates list. Add these new rates to known list to allow them. This patch also adds defines in pcm.h so that drivers can use it. Signed-off-by: Vidyakumar Athota <vathota(a)codeaurora.org> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- include/sound/pcm.h | 5 +++++ sound/core/pcm_native.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 1e9bb1c91770..bbe6eb1ff5d2 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -117,6 +117,8 @@ struct snd_pcm_ops { #define SNDRV_PCM_RATE_96000 (1<<10) /* 96000Hz */ #define SNDRV_PCM_RATE_176400 (1<<11) /* 176400Hz */ #define SNDRV_PCM_RATE_192000 (1<<12) /* 192000Hz */ +#define SNDRV_PCM_RATE_352800 (1<<13) /* 352800Hz */ +#define SNDRV_PCM_RATE_384000 (1<<14) /* 384000Hz */ #define SNDRV_PCM_RATE_CONTINUOUS (1<<30) /* continuous range */ #define SNDRV_PCM_RATE_KNOT (1<<31) /* supports more non-continuos rates */ @@ -129,6 +131,9 @@ struct snd_pcm_ops { SNDRV_PCM_RATE_88200|SNDRV_PCM_RATE_96000) #define SNDRV_PCM_RATE_8000_192000 (SNDRV_PCM_RATE_8000_96000|SNDRV_PCM_RATE_176400|\ SNDRV_PCM_RATE_192000) +#define SNDRV_PCM_RATE_8000_384000 (SNDRV_PCM_RATE_8000_192000|\ + SNDRV_PCM_RATE_352800|\ + SNDRV_PCM_RATE_384000) #define _SNDRV_PCM_FMTBIT(fmt) (1ULL << (__force int)SNDRV_PCM_FORMAT_##fmt) #define SNDRV_PCM_FMTBIT_S8 _SNDRV_PCM_FMTBIT(S8) #define SNDRV_PCM_FMTBIT_U8 _SNDRV_PCM_FMTBIT(U8) diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index 703857aab00f..11e653c8aa0e 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -2170,7 +2170,7 @@ static int snd_pcm_hw_rule_sample_bits(struct snd_pcm_hw_params *params, static const unsigned int rates[] = { 5512, 8000, 11025, 16000, 22050, 32000, 44100, - 48000, 64000, 88200, 96000, 176400, 192000 + 48000, 64000, 88200, 96000, 176400, 192000, 352800, 384000 }; const struct snd_pcm_hw_constraint_list snd_pcm_known_rates = { -- 2.21.0

2 2

[alsa-devel] [PATCH 0/4] ALSA: usb-audio: More strict validation and cleanups
by Takashi Iwai 22 Aug '19

22 Aug '19

Hi, this patchset introduces a more comprehensive validation code for USB-audio descriptor units, mainly for mixer stuff, for yet more hardening against the malformed descriptors. The rest are rather cleanups. Takashi === Takashi Iwai (4): ALSA: usb-audio: More validations of descriptor units ALSA: usb-audio: Simplify parse_audio_unit() ALSA: usb-audio: Unify the release of usb_mixer_elem_info objects ALSA: usb-audio: Remove superfluous bLength checks sound/usb/Makefile | 3 +- sound/usb/clock.c | 14 +-- sound/usb/helper.h | 4 + sound/usb/mixer.c | 237 ++++++++++++------------------------ sound/usb/power.c | 2 + sound/usb/quirks.c | 3 + sound/usb/stream.c | 25 ++-- sound/usb/validate.c | 332 +++++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 439 insertions(+), 181 deletions(-) create mode 100644 sound/usb/validate.c -- 2.16.4

2 10

[alsa-devel] [PATCH 1/2] ALSA: hda/realtek - Check beep whitelist before assigning in all codecs
by Takashi Iwai 22 Aug '19

22 Aug '19

Some Realtek codec parsers didn't check the availability of PC beep. Add has_cdefine_beep() check appropriately. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b6ae452a1d8f..19831521bd95 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -2848,7 +2848,8 @@ static int patch_alc268(struct hda_codec *codec) return err; spec = codec->spec; - spec->gen.beep_nid = 0x01; + if (has_cdefine_beep(codec)) + spec->gen.beep_nid = 0x01; spec->shutup = alc_eapd_shutup; @@ -8102,7 +8103,8 @@ static int patch_alc861(struct hda_codec *codec) return err; spec = codec->spec; - spec->gen.beep_nid = 0x23; + if (has_cdefine_beep(codec)) + spec->gen.beep_nid = 0x23; #ifdef CONFIG_PM spec->power_hook = alc_power_eapd; @@ -8203,7 +8205,8 @@ static int patch_alc861vd(struct hda_codec *codec) return err; spec = codec->spec; - spec->gen.beep_nid = 0x23; + if (has_cdefine_beep(codec)) + spec->gen.beep_nid = 0x23; spec->shutup = alc_eapd_shutup; -- 2.16.4

1 1