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

[alsa-devel] [PATCH] ALSA: mixart: fix a comment typo
by Geliang Tang 28 Dec '16

28 Dec '16

Fix a comment typo in mixart.h. Signed-off-by: Geliang Tang <geliangtang(a)gmail.com> --- sound/pci/mixart/mixart.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/mixart/mixart.h b/sound/pci/mixart/mixart.h index 0cc17e0..4267438 100644 --- a/sound/pci/mixart/mixart.h +++ b/sound/pci/mixart/mixart.h @@ -86,7 +86,7 @@ struct mixart_mgr { u32 msg_fifo[MSG_FIFO_SIZE]; int msg_fifo_readptr; int msg_fifo_writeptr; - atomic_t msg_processed; /* number of messages to be processed in takslet */ + atomic_t msg_processed; /* number of messages to be processed in tasklet */ struct mutex lock; /* interrupt lock */ struct mutex msg_lock; /* mailbox lock */ -- 2.9.3

2 1

[alsa-devel] [PATCH] Support both DSD LE/BE Amanero firmware versions
by Jussi Laako 28 Dec '16

28 Dec '16

Add DSD support for both little endian (DSD_U32_LE) and big endian (DSD_U32_BE) version of the Amanero firmware. Signed-off-by: Jussi Laako <jussi(a)sonarnerd.net> --- sound/usb/quirks.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index b3fd238..f5c68ea 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1359,6 +1359,21 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, if (fp->altsetting == 3) return SNDRV_PCM_FMTBIT_DSD_U32_BE; break; + + /* Amanero Combo384 USB interface with native DSD support */ + case USB_ID(0x16d0, 0x071a): + if (fp->altsetting == 2) { + switch (chip->dev->descriptor.bcdDevice) { + case 0x199: + return SNDRV_PCM_FMTBIT_DSD_U32_LE; + case 0x19b: + return SNDRV_PCM_FMTBIT_DSD_U32_BE; + default: + break; + } + } + break; + default: break; } -- 2.7.4

2 1

[alsa-devel] [PATCH] ALSA: use designated initializers
by Kees Cook 28 Dec '16

28 Dec '16

Prepare to mark sensitive kernel structures for randomization by making sure they're using designated initializers. These were identified during allyesconfig builds of x86, arm, and arm64, with most initializer fixes extracted from grsecurity. Signed-off-by: Kees Cook <keescook(a)chromium.org> --- sound/synth/emux/emux_seq.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c index a0209204ae48..55579f6b8cb2 100644 --- a/sound/synth/emux/emux_seq.c +++ b/sound/synth/emux/emux_seq.c @@ -33,13 +33,13 @@ static int snd_emux_unuse(void *private_data, struct snd_seq_port_subscribe *inf * MIDI emulation operators */ static struct snd_midi_op emux_ops = { - snd_emux_note_on, - snd_emux_note_off, - snd_emux_key_press, - snd_emux_terminate_note, - snd_emux_control, - snd_emux_nrpn, - snd_emux_sysex, + .note_on = snd_emux_note_on, + .note_off = snd_emux_note_off, + .key_press = snd_emux_key_press, + .note_terminate = snd_emux_terminate_note, + .control = snd_emux_control, + .nrpn = snd_emux_nrpn, + .sysex = snd_emux_sysex, }; -- 2.7.4 -- Kees Cook Nexus Security

3 2

Re: [alsa-devel] [PATCH] ALSA: cs5535audio: fix unused warnings on resume/suspend
by Takashi Iwai 28 Dec '16

28 Dec '16

On Sat, 17 Dec 2016 01:25:27 +0100, Jérémy Lefaure wrote: > > When CONFIG_PM_SLEEP is disabled, SIMPLE_DEV_PM_OPS does not use > snd_cs5535audio_resume and snd_cs5535audio_suspend functions: > > sound/pci/cs5535audio/cs5535audio_pm.c:77:12: warning: ‘snd_cs5535audio_resume’ defined but not used [-Wunused-function] > static int snd_cs5535audio_resume(struct device *dev) > ^~~~~~~~~~~~~~~~~~~~~~ > sound/pci/cs5535audio/cs5535audio_pm.c:58:12: warning: ‘snd_cs5535audio_suspend’ defined but not used [-Wunused-function] > static int snd_cs5535audio_suspend(struct device *dev) > ^~~~~~~~~~~~~~~~~~~~~~~ > > Adding __maybe_unused to the declaration of these functions removes the > warnings. > > Signed-off-by: Jérémy Lefaure <jeremy.lefaure(a)lse.epita.fr> Applied, thanks. Takashi > --- > sound/pci/cs5535audio/cs5535audio_pm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/sound/pci/cs5535audio/cs5535audio_pm.c b/sound/pci/cs5535audio/cs5535audio_pm.c > index 06ac5d8da362..82bd10b68a77 100644 > --- a/sound/pci/cs5535audio/cs5535audio_pm.c > +++ b/sound/pci/cs5535audio/cs5535audio_pm.c > @@ -55,7 +55,7 @@ static void snd_cs5535audio_stop_hardware(struct cs5535audio *cs5535au) > > } > > -static int snd_cs5535audio_suspend(struct device *dev) > +static int __maybe_unused snd_cs5535audio_suspend(struct device *dev) > { > struct snd_card *card = dev_get_drvdata(dev); > struct cs5535audio *cs5535au = card->private_data; > @@ -74,7 +74,7 @@ static int snd_cs5535audio_suspend(struct device *dev) > return 0; > } > > -static int snd_cs5535audio_resume(struct device *dev) > +static int __maybe_unused snd_cs5535audio_resume(struct device *dev) > { > struct snd_card *card = dev_get_drvdata(dev); > struct cs5535audio *cs5535au = card->private_data; > -- > 2.11.0 > >

1 0

[alsa-devel] [PATCH 0/2] ASoC: Dell IoT Gateway audio support
by Shrirang Bagul 27 Dec '16

27 Dec '16

These patches add basic audio support on new Dell Edge IoT Gateways. RT5660 codec is connected to SSP2 port on Intel Atom Baytrail E3815 SoC. The machine driver is based on bytcr_rt5640. These devices have line-in and line-out jacks with line-out mute enable gpio described in ACPI tables. Shrirang Bagul (2): ASoC: rt5660: Add ACPI support ASoC: Intel: boards: Add Baytrail RT5660 machine driver sound/soc/codecs/rt5660.c | 26 ++ sound/soc/intel/Kconfig | 13 + sound/soc/intel/atom/sst/sst_acpi.c | 2 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/bytcr_rt5660.c | 573 ++++++++++++++++++++++++++++++++++ 5 files changed, 616 insertions(+) create mode 100644 sound/soc/intel/boards/bytcr_rt5660.c -- 2.9.3

3 9

[alsa-devel] [snd-usb-audio] BUG: NULL pointer dereference at 0000000000000070
by Dave Young 25 Dec '16

25 Dec '16

Hi, With recent mainline kernel, I see a BUG, it is easy to reproduce, just plugging the usb microphone, bisected the first bad commit is: 16200948d8353fe29a473a394d7d26790deae0e7 is the first bad commit commit 16200948d8353fe29a473a394d7d26790deae0e7 Author: Takashi Iwai <tiwai(a)suse.de> Date: Mon Dec 5 11:19:38 2016 +0100 ALSA: usb-audio: Fix race at stopping the stream We've got a kernel crash report showing like: Unable to handle kernel NULL pointer dereference at virtual address 00000008 pgd = a1d7c000 [snip] The BUG dmesg itself is below: [54029.102610] input: Samson Technologies Samson Meteor Mic as /devices/pci0000:00/0000:00:14.0/usb2/2-3/2-3:1.3/0003:17A0:0310.0003/input/input19 [54029.154424] hid-generic 0003:17A0:0310.0003: input: USB HID v1.00 Device [Samson Technologies Samson Meteor Mic] on usb-0000:00:14.0-3/input3 [54029.202035] usbcore: registered new interface driver snd-usb-audio [54029.242705] BUG: unable to handle kernel NULL pointer dereference at 0000000000000070 [54029.271667] IP: retire_playback_urb+0x5/0xd0 [snd_usb_audio] [54029.300462] PGD 0 [54029.300462] [54029.355691] Oops: 0000 [#1] SMP [54029.383215] Modules linked in: snd_usb_audio snd_usbmidi_lib snd_rawmidi macvtap macvlan tun ccm rfcomm fuse snd_hda_codec_hdmi cmac bnep kvm_intel kvm irqbypass i915 arc4 intel_gtt drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm snd_hda_codec_realtek snd_hda_codec_generic iwlmvm mac80211 rtsx_pci_sdmmc iwlwifi snd_hda_intel snd_hda_codec snd_hwdep snd_hda_core cfg80211 snd_seq snd_seq_device btusb btrtl thinkpad_acpi btbcm pcspkr input_leds btintel serio_raw bluetooth snd_pcm e1000e snd_timer ptp rtsx_pci snd i2c_i801 pps_core rfkill mfd_core soundcore video nfsd auth_rpcgss nfs_acl lockd grace sunrpc [54029.480514] CPU: 1 PID: 0 Comm: swapper/1 Tainted: G W 4.9.0+ #209 [54029.514169] Hardware name: LENOVO 20ARS1BJ02/20ARS1BJ02, BIOS GJET91WW (2.41 ) 09/21/2016 [54029.548395] task: ffff9c2894a18bc0 task.stack: ffffa69dc0cd0000 [54029.582630] RIP: 0010:retire_playback_urb+0x5/0xd0 [snd_usb_audio] [54029.617049] RSP: 0018:ffff9c289f243cd0 EFLAGS: 00010086 [54029.651439] RAX: ffffffffc031bac0 RBX: ffff9c2868a8a000 RCX: 0000000000000001 [54029.686222] RDX: 0000000000000000 RSI: ffff9c288e3e3a00 RDI: 0000000000000000 [54029.721046] RBP: ffff9c289f243d00 R08: 0000000000000001 R09: ffff9c289e803b00 [54029.755850] R10: ffff9c28848f3380 R11: ffff9c289038d0b0 R12: ffff9c2868a8a140 [54029.790482] R13: ffff9c288e3e3a00 R14: 0000000000000000 R15: ffff9c288e3e0390 [54029.824649] FS: 0000000000000000(0000) GS:ffff9c289f240000(0000) knlGS:0000000000000000 [54029.859458] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [54029.894609] CR2: 0000000000000070 CR3: 000000021e008000 CR4: 00000000001406e0 [54029.929476] Call Trace: [54029.963968] <IRQ> [54029.998291] ? snd_complete_urb+0x80/0x260 [snd_usb_audio] [54030.033359] __usb_hcd_giveback_urb+0x76/0x100 [54030.068352] usb_hcd_giveback_urb+0x3c/0xc0 [54030.103167] xhci_giveback_urb_in_irq.isra.23+0x6f/0xa0 [54030.138683] finish_td.constprop.39+0x175/0x260 [54030.173733] xhci_irq+0x9f0/0x1450 [54030.208790] ? try_to_wake_up+0x1f2/0x390 [54030.243696] ? usb_hcd_poll_rh_status+0x190/0x190 [54030.278521] xhci_msi_irq+0x11/0x20 [54030.313376] __handle_irq_event_percpu+0x7e/0x1a0 [54030.348615] handle_irq_event_percpu+0x32/0x80 [54030.383917] handle_irq_event+0x2c/0x50 [54030.419012] handle_edge_irq+0x9f/0x120 [54030.454042] handle_irq+0x73/0x130 [54030.488522] ? _local_bh_enable+0x21/0x50 [54030.522777] do_IRQ+0x46/0xd0 [54030.556882] common_interrupt+0x90/0x90 [54030.591095] RIP: 0010:cpuidle_enter_state+0x134/0x2a0 [54030.625661] RSP: 0018:ffffa69dc0cd3e60 EFLAGS: 00000246 ORIG_RAX: ffffffffffffff2c [54030.660438] RAX: 0000000000000000 RBX: 00003123a9d13159 RCX: 000000000000001f [54030.695705] RDX: 00003123a9d13159 RSI: ffff9c289f254f98 RDI: 0000000000000000 [54030.731113] RBP: ffffa69dc0cd3e98 R08: cccccccccccccccd R09: 0000000000000018 [54030.766539] R10: 000000000000019c R11: 00000000000000a7 R12: 0000000000000004 [54030.802207] R13: 0000000000000004 R14: ffff9c289f25db08 R15: 00003123a9c9b583 [54030.837897] </IRQ> [54030.873227] cpuidle_enter+0x17/0x20 [54030.908827] call_cpuidle+0x23/0x40 [54030.944343] do_idle+0x189/0x200 [54030.979754] cpu_startup_entry+0x71/0x80 [54031.015166] start_secondary+0x142/0x160 [54031.050630] start_cpu+0x14/0x14 [54031.085944] Code: e9 03 41 5e 5d f7 f1 89 c0 c3 41 8b 76 64 4c 89 e7 e8 f0 fe ff ff eb c4 0f 1f 40 00 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 44 00 00 <48> 8b 4f 70 31 d2 8b 86 88 00 00 00 f7 b1 98 15 00 00 85 c0 75 [54031.124608] RIP: retire_playback_urb+0x5/0xd0 [snd_usb_audio] RSP: ffff9c289f243cd0 [54031.162852] CR2: 0000000000000070

1 0

[alsa-devel] How to keep track of the amount of queued samples?
by Jan Deinhard 23 Dec '16

23 Dec '16

Hi, I would like to understand the following quote which I copied from https://www.kernel.org/doc/Documentation/sound/alsa/timestamping.txt "The ALSA API provides two basic pieces of information, avail and delay, which combined with the trigger and current system timestamps allow for applications to keep track of the 'fullness' of the ring buffer and the amount of queued samples." Querying avail and delay is straight forward. But I have no idea how to use these values in combination with trigger_htstamp and the current system timestamp to calculate the fullness of the ring buffer. Can someone provide some insight? What exactly is meant by "current system timestamp"? Is it provied by ALSA (htstamp?) or should I use clock_gettime(CLOCK_MONOTONIC, &system_time); to get that timestamp? Thanks, Jan

2 1

[alsa-devel] [PATCH 1/2] ucm: Automatically load the best config file based on the card long name
by mengdong.lin＠linux.intel.com 23 Dec '16

23 Dec '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> Intel DSP platform drivers are used by many different devices. For user space to differentiate them, ASoC machine driver may include the DMI info (vendor, product and board) in card long name. Possible card long names are: broadwell-rt286-Dell Inc.-XPS 13 9343-0310JH broadwell-rt286-Intel Corp.-Broadwell Client platform-Wilson Beach SDS bytcr-rt5640-ASUSTeK COMPUTER INC.-T100TA-T100TA bytcr-rt5651-Circuitco-Minnowboard Max D0 PLATFORM-MinnowBoard MAX ... And user space can define configuration files including fields separated by '.' as below: broadwell-rt286 broadwell-rt286.Dell.XPS bytcr-rt5640 bytcr-rt5640.ASUS.T100 bytcr-rt5651.MinnowboardMax ... When being asked to load configuration file of a card, UCM will try to find the card long name from the local machine, and then scan all available configuration file names, search every field of config file name in the card long name. The more characters match, the higher score the file has. Finally, the file with the highest score will be loaded to configure the sound card. Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> diff --git a/src/ucm/parser.c b/src/ucm/parser.c index c98373a..ff75da7 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -55,6 +55,9 @@ static const char * const component_dir[] = { NULL, /* terminator */ }; +static int filename_filter(const struct dirent *dirent); +static int is_component_directory(const char *dir); + static int parse_sequence(snd_use_case_mgr_t *uc_mgr, struct list_head *base, snd_config_t *cfg); @@ -1328,6 +1331,210 @@ static int parse_master_file(snd_use_case_mgr_t *uc_mgr, snd_config_t *cfg) return 0; } +/* trim SPACE (0x20) from the string */ +static void trim_space(char *str) +{ + int i, j = 0; + + for (i = 0; str[i] && i < MAX_FILE; i++) { + if (str[i] != 0x20) + str[j++] = str[i]; + } + + str[j] = '\0'; +} + +/* find and store the card long name if the card is in this machine */ +static int get_card_long_name(snd_use_case_mgr_t *mgr) +{ + const char *card_name = mgr->card_name; + snd_ctl_t *handle; + int card, err, dev, idx; + snd_ctl_card_info_t *info; + const char *_name, *_long_name; + + snd_ctl_card_info_alloca(&info); + + card = -1; + if (snd_card_next(&card) < 0 || card < 0) { + uc_error("no soundcards found..."); + return -1; + } + + while (card >= 0) { + char name[32]; + + sprintf(name, "hw:%d", card); + err = snd_ctl_open(&handle, name, 0); + if (err < 0) { + uc_error("control open (%i): %s", card, + snd_strerror(err)); + goto next_card; + } + + err = snd_ctl_card_info(handle, info); + if (err < 0) { + uc_error("control hardware info (%i): %s", card, + snd_strerror(err)); + snd_ctl_close(handle); + goto next_card; + } + + _name = snd_ctl_card_info_get_name(info); + if (!strncmp(card_name, _name, 32)) { + _long_name = snd_ctl_card_info_get_longname(info); + strncpy(mgr->card_long_name, _long_name, + MAX_CARD_LONG_NAME); + snd_ctl_close(handle); + return 0; + } + + snd_ctl_close(handle); +next_card: + if (snd_card_next(&card) < 0) { + uc_error("snd_card_next"); + break; + } + } + + return -1; +} + +/* This function will find the best device-specific configuration file based + * on the sound card long name. + * Different devices may share the same sound driver and thus the same sound + * card name (short name), but they may still need different device-specific + * configurations. For user space to differentiate them, kernel drivers may + * include the DMI info (vendor, product and board) in the card long name. + * And user space can define configuration file names appending DMI keywords + * to the card name, like: + * bytcr-rt5640.ASUS.T100 + * bytcr-rt5651.MinnowBoard + * + * When being asked to load the configuration file for a card, this function + * will try to find the card long name from the local machine, and then scan + * all available configuration file names, search every field of the config + * file name in the card long name. The more characters match, the higher + * score the file has. Finally, the file with the highest score will be loaded. + */ +static void find_best_config_file(snd_use_case_mgr_t *mgr) +{ + const char *card_name = mgr->card_name; + char name[MAX_FILE]; + char *env = getenv(ALSA_CONFIG_UCM_VAR); + struct dirent **namelist; + char card_long_name[MAX_CARD_LONG_NAME]; + char *lpos, *lpos_next, *lname_end; + char *d_name, *dpos, *dpos_next, *d_name_end; + int d_name_len, field_len, long_name_len; + int i, cnt, err; + int score, score_max = 0, d_index = -1; + int is_first_field; + + if (get_card_long_name(mgr) < 0) { + /* cannot get long name, use card name as the conf file name */ + strcpy(mgr->conf_file_name, mgr->card_name); + return; + } + + strncpy(card_long_name, mgr->card_long_name, MAX_CARD_LONG_NAME); + trim_space(card_long_name); /* trim SPACE for matching */ + lname_end = card_long_name + strlen(card_long_name); + + /* get list of card directories under /usr/share/alsa/ucm */ + snprintf(name, sizeof(name)-1, + "%s", env ? env : ALSA_USE_CASE_DIR); + name[MAX_FILE-1] = '\0'; + + err = scandir(name, &namelist, filename_filter, alphasort); + if (err < 0) { + err = -errno; + uc_error("error: could not scan directory %s: %s", + name, strerror(-err)); + return; + } + cnt = err; + + /* scan the card directory names */ + for (i = 0; i < cnt; i++) { + + /* Skip the directories for component devices */ + if (is_component_directory(namelist[i]->d_name)) + continue; + + score = 0; + lpos = card_long_name; + + d_name = namelist[i]->d_name; + d_name_len = strlen(d_name); + d_name_end = d_name + d_name_len; + is_first_field = 1; + dpos = d_name; + + /* scan fields in the card directory name, separated by '.' */ + while (1) { + dpos_next = strchr(dpos, '.'); + if (dpos_next == dpos) /* start with '.' */ + goto next_field; + + if (!dpos_next) /* last field */ + field_len = d_name_end - dpos; + else + field_len = dpos_next - dpos; + + memcpy(name, dpos, field_len); + name[field_len] = '\0'; + + /* search the field in the given card long name */ + lpos_next = strstr(lpos, name); + if (!lpos_next) { + /* first field is the card name, must match */ + if (is_first_field) + break; + goto next_field; + } else { + /* The more characters match, + * the higher the score is. + */ + score += field_len; + if (lpos_next + field_len >= lname_end) + break; /* reach end of long name */ + + /* Skip the matched field, + * for searching next field. + */ + lpos = lpos_next + field_len; + } + +next_field: + if (!dpos_next) + break; /* no more fields */ + + dpos = dpos_next + 1; /* skip the separator '.' */ + is_first_field = 0; + if (dpos >= d_name_end) + break; + } + + if (score > score_max) { + score_max = score; + d_index = i; + } else if (score == 0 && score_max > 0) { + /* passed the card directories that can match, + * since directories are in alphabetical order. + */ + break; + } + } + + if (d_index >= 0) + strncpy(mgr->conf_file_name, namelist[d_index]->d_name, + MAX_CARD_LONG_NAME); + else + strncpy(mgr->conf_file_name, mgr->card_name, + MAX_CARD_LONG_NAME); +} + static int load_master_config(const char *card_name, snd_config_t **cfg) { char filename[MAX_FILE]; @@ -1355,7 +1562,9 @@ int uc_mgr_import_master_config(snd_use_case_mgr_t *uc_mgr) snd_config_t *cfg; int err; - err = load_master_config(uc_mgr->card_name, &cfg); + find_best_config_file(uc_mgr); + + err = load_master_config(uc_mgr->conf_file_name, &cfg); if (err < 0) return err; err = parse_master_file(uc_mgr, cfg); diff --git a/src/ucm/ucm_local.h b/src/ucm/ucm_local.h index 6d3302f..299a5b9 100644 --- a/src/ucm/ucm_local.h +++ b/src/ucm/ucm_local.h @@ -41,6 +41,7 @@ #include "use-case.h" #define MAX_FILE 256 +#define MAX_CARD_LONG_NAME 80 #define ALSA_USE_CASE_DIR ALSA_CONFIG_DIR "/ucm" #define SEQUENCE_ELEMENT_TYPE_CDEV 1 @@ -190,6 +191,8 @@ struct use_case_verb { */ struct snd_use_case_mgr { char *card_name; + char card_long_name[MAX_CARD_LONG_NAME]; + char conf_file_name[MAX_CARD_LONG_NAME]; char *comment; /* use case verb, devices and modifier configs parsed from files */ -- 2.7.4

5 11

[alsa-devel] [PATCH 0/2] ASoC: Use DMI name in sound card long name
by mengdong.lin＠linux.intel.com 22 Dec '16

22 Dec '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> This series is based on Liam's idea to use DMI name as the sound card short name in the audio workshop. Now we add DMI info to the card long name: - Not change the card name (short name), keep it simple. So the card ID won't change as well. - Use short name and DMI name together to make a readable and unqique long name. Machine drivers can use a new API to get this feature. In user space, when the sound server ask UCM to open a sound card, UCM will try to find the best configuration file based on the card long name, and only if not avaiable, fallback to the default configuration file that matches the card name (short name). Please see patch: ucm: Automatically load the best config file based on the card long name History: v1 from RFC: Give up using a table to map DMI info to a simple string, since we cannot maintain such a table for each machine. Just do verbatim copy of DMI info and let user space decide how to use the DMI info in card long name to find the best UCM config file. If device driver adds a flavor string, just append it after the DMI info fields to the card long name. Liam Girdwood (1): ASoC: core: Add API to use DMI name in sound card long name Mengdong Lin (1): ASoC: Intel: Use DMI name for sound card long name in Broadwell machine driver include/sound/soc.h | 4 ++ sound/soc/intel/boards/broadwell.c | 2 + sound/soc/soc-core.c | 81 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 87 insertions(+) -- 2.5.0

5 8

[alsa-devel] [PATCH] Revert "ALSA: usb-audio: Fix race at stopping the stream"
by Takashi Iwai 21 Dec '16

21 Dec '16

This reverts commit 16200948d8353fe29a473a394d7d26790deae0e7. The commit was intended to cover the race condition, but it introduced yet another regression for devices with the implicit feedback, leading to a kernel panic due to NULL-dereference in an irq context. As the race condition that was addressed by the commit is very rare and the regression is much worse, let's revert the commit for rc1, and fix the issue properly in a later patch. Fixes: 16200948d835 ("ALSA: usb-audio: Fix race at stopping the stream") Reported-by: Ioan-Adrian Ratiu <adi(a)adirat.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- Linus, could you take this manually for rc1? I'm traveling and having a difficulty to set up a git pull request right now. Sorry for inconvenience. Thanks! Takashi sound/usb/endpoint.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index a2cdf3370afe..15d1d5c63c3c 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -384,9 +384,6 @@ static void snd_complete_urb(struct urb *urb) if (unlikely(atomic_read(&ep->chip->shutdown))) goto exit_clear; - if (unlikely(!test_bit(EP_FLAG_RUNNING, &ep->flags))) - goto exit_clear; - if (usb_pipeout(ep->pipe)) { retire_outbound_urb(ep, ctx); /* can be stopped during retire callback */ @@ -537,11 +534,6 @@ static int wait_clear_urbs(struct snd_usb_endpoint *ep) alive, ep->ep_num); clear_bit(EP_FLAG_STOPPING, &ep->flags); - ep->data_subs = NULL; - ep->sync_slave = NULL; - ep->retire_data_urb = NULL; - ep->prepare_data_urb = NULL; - return 0; } @@ -1028,6 +1020,10 @@ void snd_usb_endpoint_stop(struct snd_usb_endpoint *ep) if (--ep->use_count == 0) { deactivate_urbs(ep, false); + ep->data_subs = NULL; + ep->sync_slave = NULL; + ep->retire_data_urb = NULL; + ep->prepare_data_urb = NULL; set_bit(EP_FLAG_STOPPING, &ep->flags); } } -- 2.11.0

1 0