March 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [RESEND PATCH 0/2] ASoC: Add support for max9759 Amplifier Driver
by Neil Armstrong 12 Mar '18

12 Mar '18

The MAX9759 is a gpio controlled speaker amplifier, this patchset add the DT Bindings and the corresponding ASoC component driver. Changes with resend : - Add rob ack on bindings Neil Armstrong (2): ASoC: Add DT bindings documentation for max9759 amplifier ASoC: max9759: Add Amplifier Driver .../devicetree/bindings/sound/maxim,max9759.txt | 18 ++ sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/max9759.c | 207 +++++++++++++++++++++ 4 files changed, 232 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/maxim,max9759.txt create mode 100644 sound/soc/codecs/max9759.c -- 2.7.4

2 3

[alsa-devel] [PATCH] ASoC: soc-core: Add missing NULL check
by Kees Cook 12 Mar '18

12 Mar '18

If a codec is not attached to the sound soc, a NULL deref is possible as a regular user in /sys. [ 2278.331878] DSS: context saved [ 2278.820343] Unable to handle kernel NULL pointer dereference at virtual address 00000004 [ 2278.828948] pgd = c36040a2 [ 2278.831787] [00000004] *pgd=876c4831, *pte=00000000, *ppte=00000000 [ 2278.838439] Internal error: Oops: 17 [#1] ARM [ 2278.843017] Modules linked in: [ 2278.846221] CPU: 0 PID: 16337 Comm: grep Tainted: G W 4.16.0-rc4-next-20180308 #71 [ 2278.855529] Hardware name: Nokia RX-51 board [ 2278.860015] PC is at soc_codec_reg_show+0x8/0x19c [ 2278.864959] LR is at codec_reg_show+0x28/0x30 Reported-by: Pavel Machek <pavel(a)ucw.cz> Signed-off-by: Kees Cook <keescook(a)chromium.org> --- No idea if this is the _right_ fix, but it should stop the crash from unprivileged userspace. --- sound/soc/soc-core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 96c44f6576c9..78ad165ad424 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -137,6 +137,9 @@ static ssize_t soc_codec_reg_show(struct snd_soc_codec *codec, char *buf, size_t total = 0; loff_t p = 0; + if (!codec || !codec->driver) + return 0; + wordsize = min_bytes_needed(codec->driver->reg_cache_size) * 2; regsize = codec->driver->reg_word_size * 2; -- 2.7.4 -- Kees Cook Pixel Security

4 7

[alsa-devel] [PATCH] echoaudio: remove redundant initialization of pointer 'pipe'
by Colin King 12 Mar '18

12 Mar '18

From: Colin Ian King <colin.king(a)canonical.com> The pointer 'pipe' is being initialized with a value that is never read and it is re-assigned later, hence the initialization is redundant and can be removed. Also remove pointer 'runtime' as it is no longer required. Cleans up clang warning: sound/pci/echoaudio/echoaudio.c:740:20: warning: Value stored to 'pipe' during its initialization is never read Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/pci/echoaudio/echoaudio.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index d68f99e076a8..0935a5c8741f 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -736,8 +736,7 @@ static int pcm_prepare(struct snd_pcm_substream *substream) static int pcm_trigger(struct snd_pcm_substream *substream, int cmd) { struct echoaudio *chip = snd_pcm_substream_chip(substream); - struct snd_pcm_runtime *runtime = substream->runtime; - struct audiopipe *pipe = runtime->private_data; + struct audiopipe *pipe; int i, err; u32 channelmask = 0; struct snd_pcm_substream *s; -- 2.15.1

2 1

[alsa-devel] [PATCH] ALSA: hda - Revert power_save option default value
by Takashi Iwai 12 Mar '18

12 Mar '18

With the commit 1ba8f9d30817 ("ALSA: hda: Add a power_save blacklist"), we changed the default value of power_save option to -1 for processing the power-save blacklist. Unfortunately, this seems breaking user-space applications that actually read the power_save parameter value via sysfs and judge / adjust the power-saving status. They see the value -1 as if the power-save is turned off, although the actual value is taken from CONFIG_SND_HDA_POWER_SAVE_DEFAULT and it can be a positive. So, overall, passing -1 there was no good idea. Let's partially revert it -- at least for power_save option default value is restored again to CONFIG_SND_HDA_POWER_SAVE_DEFAULT. Meanwhile, in this patch, we keep the blacklist behavior and make is adjustable via the new option, pm_blacklist. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=199073 Fixes: 1ba8f9d30817 ("ALSA: hda: Add a power_save blacklist") Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/hda_intel.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 96143df19b21..d5017adf9feb 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -181,11 +181,15 @@ static const struct kernel_param_ops param_ops_xint = { }; #define param_check_xint param_check_int -static int power_save = -1; +static int power_save = CONFIG_SND_HDA_POWER_SAVE_DEFAULT; module_param(power_save, xint, 0644); MODULE_PARM_DESC(power_save, "Automatic power-saving timeout " "(in second, 0 = disable)."); +static bool pm_blacklist = true; +module_param(pm_blacklist, bool, 0644); +MODULE_PARM_DESC(pm_blacklist, "Enable power-management blacklist"); + /* reset the HD-audio controller in power save mode. * this may give more power-saving, but will take longer time to * wake up. @@ -2300,10 +2304,9 @@ static int azx_probe_continue(struct azx *chip) val = power_save; #ifdef CONFIG_PM - if (val == -1) { + if (pm_blacklist) { const struct snd_pci_quirk *q; - val = CONFIG_SND_HDA_POWER_SAVE_DEFAULT; q = snd_pci_quirk_lookup(chip->pci, power_save_blacklist); if (q && val) { dev_info(chip->card->dev, "device %04x:%04x is on the power_save blacklist, forcing power_save to 0\n", -- 2.16.2

2 1

Re: [alsa-devel] [RFC] hda/realtek filtered headphone output
by Takashi Iwai 12 Mar '18

12 Mar '18

Resending with the correct Cc to alsa-devel ML... On Mon, 05 Mar 2018 12:55:30 +0100, Takashi Iwai wrote: > > On Sat, 03 Mar 2018 13:06:49 +0100, > René Rebe wrote: > > > > Hi all, > > > > testing some new laptops, I noticed the headphone frequency response was lacking > > bass. First I noticed this in the Lenovo T470s, and later I found this also be the case > > on Surface Pro 2 and 3. The Dell XPS13 may also be affected, but I had to return it > > before I found out the solution on the other machines: > > > > https://www.youtube.com/watch?v=a1YkPtfC4LI > > > > I had not yet sent the patch because a) I was too busy and b) I wanted to review this further. > > > > As the other day I got a Lenovo ideapad 720s to test with exactly the same issue, here is the > > current hacked patch: > > > > https://svn.exactcode.de/t2/trunk/package/base/linux/surface-audio.patch > > > > However, given that all newer realtek codecs that came on my desk are affected, > > maybe there is something wrong with the hda_auto_parser.c - I did not yet fully grasp > > all the logic of that. > > > > As you can see in the patch and video (…) the problem is the signal routing of NID 0x15 > > or 0x21 (depending whether it is an older, or newer codec). This is the headphone out, > > and as far as I can see the auto_parser assigned the index 0 pcm output (NID 0x0c) > > which result in this filtered frequency response, likely intended for the laptop’s speakers? > > Using the next NID (I guess that was 0xd?) results in a full frequency response and at > > least to my ears is immediately hearable and obvious. > > > > Without this fixed routing the headphone sounds like a PC speaker in a coke can. > > > > So the question for the authors and HDA experts: Can this be fixed in the auto_parser, > > or is my patch (which btw. has to small unrelated cleanups) modulo potentially some > > renaming of the enum and function, now that more than the Surface is affected, the > > way to go? If this can be fixed more generally I would be happy to hear! > > Could you give the output of alsa-info.sh? We need to check the > details of the codec topology. > > In general, the right approach is to fix at parsing the routing, not > fiddling with the codec routing dynamically at initialization. > > Currently the easy fix would be to provide the fixed DAC connection > list. Maybe we can enhance the generic parser to receive some hints > for DAC selection. The routes are determined by calculating "badness" > values per route, so in theory, we can give some badness values > depending on the target pin type (headphone, speaker, etc). > > > thanks, > > Takashi

1 0

[alsa-devel] [PATCH 0/3] ASoC: Add Multi CPU DAI support
by Shreyas NC 12 Mar '18

12 Mar '18

As discussed in [1], ASoC core supports multi codec DAIs on a DAI link. However it does not do so for CPU DAIs. So, add support for multi CPU DAIs on a DAI Link by adding multi CPU DAI in Card instantiation, suspend and resume functions, PCM ops, stream handling functions and DAPM. [1]: https://www.spinics.net/lists/alsa-devel/msg71369.html Shreyas NC (3): ASoC: Add initial support for multiple CPU DAIs ASoC: Add Multi CPU DAI support for PCM ops ASoC: Add Multi CPU DAI support in DAPM include/sound/soc.h | 5 + sound/soc/soc-core.c | 195 ++++++++++++++++------ sound/soc/soc-dapm.c | 71 +++++--- sound/soc/soc-pcm.c | 460 +++++++++++++++++++++++++++++++++------------------ 4 files changed, 495 insertions(+), 236 deletions(-) -- 2.7.4

2 10

[alsa-devel] [PATCH] ALSA: pcm: Fix UAF in snd_pcm_oss_get_formats()
by Takashi Iwai 11 Mar '18

11 Mar '18

snd_pcm_oss_get_formats() has an obvious UAF around snd_mask_test() calls, as spotted by syzbot. The passed format_mask argument is a pointer to the hw_params object that is freed before the loop. What a surprise that it has been present since the original code of decades ago... Reported-by: syzbot+4090700a4f13fccaf648(a)syzkaller.appspotmail.com Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/oss/pcm_oss.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index b044c0a5a674..02298c9c6020 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -1762,10 +1762,9 @@ static int snd_pcm_oss_get_formats(struct snd_pcm_oss_file *pcm_oss_file) return -ENOMEM; _snd_pcm_hw_params_any(params); err = snd_pcm_hw_refine(substream, params); - format_mask = hw_param_mask_c(params, SNDRV_PCM_HW_PARAM_FORMAT); - kfree(params); if (err < 0) - return err; + goto error; + format_mask = hw_param_mask_c(params, SNDRV_PCM_HW_PARAM_FORMAT); for (fmt = 0; fmt < 32; ++fmt) { if (snd_mask_test(format_mask, fmt)) { int f = snd_pcm_oss_format_to(fmt); @@ -1773,7 +1772,10 @@ static int snd_pcm_oss_get_formats(struct snd_pcm_oss_file *pcm_oss_file) formats |= f; } } - return formats; + + error: + kfree(params); + return err < 0 ? err : formats; } static int snd_pcm_oss_set_format(struct snd_pcm_oss_file *pcm_oss_file, int format) -- 2.16.2

1 0

[alsa-devel] KASAN: use-after-free Read in snd_pcm_oss_get_formats
by syzbot 11 Mar '18

11 Mar '18

Hello, syzbot hit the following crash on upstream commit 1b88accf6a659c46d5c8e68912896f112bf882bb (Thu Mar 8 01:49:33 2018 +0000) Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost So far this crash happened 3 times on upstream. C reproducer is attached. syzkaller reproducer is attached. Raw console output is attached. compiler: gcc (GCC) 7.1.1 20170620 .config is attached. IMPORTANT: if you fix the bug, please add the following tag to the commit: Reported-by: syzbot+4090700a4f13fccaf648(a)syzkaller.appspotmail.com It will help syzbot understand when the bug is fixed. See footer for details. If you forward the report, please keep this part and the footer. IPVS: ftp: loaded support on port[0] = 21 audit: type=1400 audit(1520612143.836:8): avc: denied { map } for pid=4259 comm="syzkaller191035" path="/dev/dsp1" dev="devtmpfs" ino=1250 scontext=unconfined_u:system_r:insmod_t:s0-s0:c0.c1023 tcontext=system_u:object_r:sound_device_t:s0 tclass=chr_file permissive=1 IPVS: ftp: loaded support on port[0] = 21 IPVS: ftp: loaded support on port[0] = 21 ================================================================== BUG: KASAN: use-after-free in snd_mask_test include/sound/pcm_params.h:141 [inline] BUG: KASAN: use-after-free in snd_pcm_oss_get_formats+0x320/0x380 sound/core/oss/pcm_oss.c:1770 Read of size 4 at addr ffff8801bace4024 by task syzkaller191035/4271 CPU: 0 PID: 4271 Comm: syzkaller191035 Not tainted 4.16.0-rc4+ #346 IPVS: ftp: loaded support on port[0] = 21 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:17 [inline] dump_stack+0x194/0x24d lib/dump_stack.c:53 IPVS: ftp: loaded support on port[0] = 21 print_address_description+0x73/0x250 mm/kasan/report.c:256 kasan_report_error mm/kasan/report.c:354 [inline] kasan_report+0x23c/0x360 mm/kasan/report.c:412 __asan_report_load4_noabort+0x14/0x20 mm/kasan/report.c:432 snd_mask_test include/sound/pcm_params.h:141 [inline] snd_pcm_oss_get_formats+0x320/0x380 sound/core/oss/pcm_oss.c:1770 snd_pcm_oss_set_format sound/core/oss/pcm_oss.c:1784 [inline] snd_pcm_oss_ioctl+0x1e2f/0x39f0 sound/core/oss/pcm_oss.c:2515 IPVS: ftp: loaded support on port[0] = 21 IPVS: ftp: loaded support on port[0] = 21 vfs_ioctl fs/ioctl.c:46 [inline] do_vfs_ioctl+0x1b1/0x1520 fs/ioctl.c:686 SYSC_ioctl fs/ioctl.c:701 [inline] SyS_ioctl+0x8f/0xc0 fs/ioctl.c:692 do_syscall_64+0x281/0x940 arch/x86/entry/common.c:287 entry_SYSCALL_64_after_hwframe+0x42/0xb7 RIP: 0033:0x4499e9 RSP: 002b:00007fa1872a5da8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 00000000006dbc24 RCX: 00000000004499e9 RDX: 0000000020000080 RSI: 00800000c0045005 RDI: 0000000000000003 RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00000000006dbc20 R13: 7073642f7665642f R14: 00800000c0045005 R15: 0000000000000003 Allocated by task 4271: save_stack+0x43/0xd0 mm/kasan/kasan.c:447 set_track mm/kasan/kasan.c:459 [inline] kasan_kmalloc+0xad/0xe0 mm/kasan/kasan.c:552 kmem_cache_alloc_trace+0x136/0x740 mm/slab.c:3607 kmalloc include/linux/slab.h:512 [inline] snd_pcm_oss_get_formats+0x1c7/0x380 sound/core/oss/pcm_oss.c:1760 snd_pcm_oss_set_format sound/core/oss/pcm_oss.c:1784 [inline] snd_pcm_oss_ioctl+0x1e2f/0x39f0 sound/core/oss/pcm_oss.c:2515 vfs_ioctl fs/ioctl.c:46 [inline] do_vfs_ioctl+0x1b1/0x1520 fs/ioctl.c:686 SYSC_ioctl fs/ioctl.c:701 [inline] SyS_ioctl+0x8f/0xc0 fs/ioctl.c:692 do_syscall_64+0x281/0x940 arch/x86/entry/common.c:287 entry_SYSCALL_64_after_hwframe+0x42/0xb7 Freed by task 4271: save_stack+0x43/0xd0 mm/kasan/kasan.c:447 set_track mm/kasan/kasan.c:459 [inline] __kasan_slab_free+0x11a/0x170 mm/kasan/kasan.c:520 kasan_slab_free+0xe/0x10 mm/kasan/kasan.c:527 __cache_free mm/slab.c:3485 [inline] kfree+0xd9/0x260 mm/slab.c:3800 snd_pcm_oss_get_formats+0x216/0x380 sound/core/oss/pcm_oss.c:1766 snd_pcm_oss_set_format sound/core/oss/pcm_oss.c:1784 [inline] snd_pcm_oss_ioctl+0x1e2f/0x39f0 sound/core/oss/pcm_oss.c:2515 vfs_ioctl fs/ioctl.c:46 [inline] do_vfs_ioctl+0x1b1/0x1520 fs/ioctl.c:686 SYSC_ioctl fs/ioctl.c:701 [inline] SyS_ioctl+0x8f/0xc0 fs/ioctl.c:692 do_syscall_64+0x281/0x940 arch/x86/entry/common.c:287 entry_SYSCALL_64_after_hwframe+0x42/0xb7 The buggy address belongs to the object at ffff8801bace4000 which belongs to the cache kmalloc-1024 of size 1024 The buggy address is located 36 bytes inside of 1024-byte region [ffff8801bace4000, ffff8801bace4400) The buggy address belongs to the page: page:ffffea0006eb3900 count:1 mapcount:0 mapping:ffff8801bace4000 index:0x0 compound_mapcount: 0 flags: 0x2fffc0000008100(slab|head) raw: 02fffc0000008100 ffff8801bace4000 0000000000000000 0000000100000007 raw: ffffea000761d7a0 ffffea0006eb39a0 ffff8801dac00ac0 0000000000000000 page dumped because: kasan: bad access detected Memory state around the buggy address: ffff8801bace3f00: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc ffff8801bace3f80: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc > ffff8801bace4000: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ^ ffff8801bace4080: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ffff8801bace4100: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb ================================================================== --- This bug is generated by a dumb bot. It may contain errors. See https://goo.gl/tpsmEJ for details. Direct all questions to syzkaller(a)googlegroups.com. syzbot will keep track of this bug report. If you forgot to add the Reported-by tag, once the fix for this bug is merged into any tree, please reply to this email with: #syz fix: exact-commit-title If you want to test a patch for this bug, please reply with: #syz test: git://repo/address.git branch and provide the patch inline or as an attachment. To mark this as a duplicate of another syzbot report, please reply with: #syz dup: exact-subject-of-another-report If it's a one-off invalid bug report, please reply with: #syz invalid Note: if the crash happens again, it will cause creation of a new bug report. Note: all commands must start from beginning of the line in the email body.

2 1

[alsa-devel] [PATCH 1/2] ALSA: seq: Fix possible UAF in snd_seq_check_queue()
by Takashi Iwai 10 Mar '18

10 Mar '18

Although we've covered the races between concurrent write() and ioctl() in the previous patch series, there is still a possible UAF in the following scenario: A: user client closed B: timer irq -> snd_seq_release() -> snd_seq_timer_interrupt() -> snd_seq_free_client() -> snd_seq_check_queue() -> cell = snd_seq_prioq_cell_peek() -> snd_seq_prioq_leave() .... removing all cells -> snd_seq_pool_done() .... vfree() -> snd_seq_compare_tick_time(cell) ... Oops So the problem is that a cell is peeked and accessed without any protection until it's retrieved from the queue again via snd_seq_prioq_cell_out(). This patch tries to address it, also cleans up the code by a slight refactoring. snd_seq_prioq_cell_out() now receives an extra pointer argument. When it's non-NULL, the function checks the event timestamp with the given pointer. The caller needs to pass the right reference either to snd_seq_tick or snd_seq_realtime depending on the event timestamp type. A good news is that the above change allows us to remove the snd_seq_prioq_cell_peek(), too, thus the patch actually reduces the code size. Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/core/seq/seq_prioq.c | 28 ++++++++++++++-------------- sound/core/seq/seq_prioq.h | 6 ++---- sound/core/seq/seq_queue.c | 28 +++++++++------------------- 3 files changed, 25 insertions(+), 37 deletions(-) diff --git a/sound/core/seq/seq_prioq.c b/sound/core/seq/seq_prioq.c index bc1c8488fc2a..2bc6759e4adc 100644 --- a/sound/core/seq/seq_prioq.c +++ b/sound/core/seq/seq_prioq.c @@ -87,7 +87,7 @@ void snd_seq_prioq_delete(struct snd_seq_prioq **fifo) if (f->cells > 0) { /* drain prioQ */ while (f->cells > 0) - snd_seq_cell_free(snd_seq_prioq_cell_out(f)); + snd_seq_cell_free(snd_seq_prioq_cell_out(f, NULL)); } kfree(f); @@ -214,8 +214,18 @@ int snd_seq_prioq_cell_in(struct snd_seq_prioq * f, return 0; } +/* return 1 if the current time >= event timestamp */ +static int event_is_ready(struct snd_seq_event *ev, void *current_time) +{ + if ((ev->flags & SNDRV_SEQ_TIME_STAMP_MASK) == SNDRV_SEQ_TIME_STAMP_TICK) + return snd_seq_compare_tick_time(current_time, &ev->time.tick); + else + return snd_seq_compare_real_time(current_time, &ev->time.time); +} + /* dequeue cell from prioq */ -struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f) +struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f, + void *current_time) { struct snd_seq_event_cell *cell; unsigned long flags; @@ -227,6 +237,8 @@ struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f) spin_lock_irqsave(&f->lock, flags); cell = f->head; + if (cell && current_time && !event_is_ready(&cell->event, current_time)) + cell = NULL; if (cell) { f->head = cell->next; @@ -252,18 +264,6 @@ int snd_seq_prioq_avail(struct snd_seq_prioq * f) return f->cells; } - -/* peek at cell at the head of the prioq */ -struct snd_seq_event_cell *snd_seq_prioq_cell_peek(struct snd_seq_prioq * f) -{ - if (f == NULL) { - pr_debug("ALSA: seq: snd_seq_prioq_cell_in() called with NULL prioq\n"); - return NULL; - } - return f->head; -} - - static inline int prioq_match(struct snd_seq_event_cell *cell, int client, int timestamp) { diff --git a/sound/core/seq/seq_prioq.h b/sound/core/seq/seq_prioq.h index d38bb78d9345..2c315ca10fc4 100644 --- a/sound/core/seq/seq_prioq.h +++ b/sound/core/seq/seq_prioq.h @@ -44,14 +44,12 @@ void snd_seq_prioq_delete(struct snd_seq_prioq **fifo); int snd_seq_prioq_cell_in(struct snd_seq_prioq *f, struct snd_seq_event_cell *cell); /* dequeue cell from prioq */ -struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f); +struct snd_seq_event_cell *snd_seq_prioq_cell_out(struct snd_seq_prioq *f, + void *current_time); /* return number of events available in prioq */ int snd_seq_prioq_avail(struct snd_seq_prioq *f); -/* peek at cell at the head of the prioq */ -struct snd_seq_event_cell *snd_seq_prioq_cell_peek(struct snd_seq_prioq *f); - /* client left queue */ void snd_seq_prioq_leave(struct snd_seq_prioq *f, int client, int timestamp); diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c index 0428e9061b47..b377f5048352 100644 --- a/sound/core/seq/seq_queue.c +++ b/sound/core/seq/seq_queue.c @@ -277,30 +277,20 @@ void snd_seq_check_queue(struct snd_seq_queue *q, int atomic, int hop) __again: /* Process tick queue... */ - while ((cell = snd_seq_prioq_cell_peek(q->tickq)) != NULL) { - if (snd_seq_compare_tick_time(&q->timer->tick.cur_tick, - &cell->event.time.tick)) { - cell = snd_seq_prioq_cell_out(q->tickq); - if (cell) - snd_seq_dispatch_event(cell, atomic, hop); - } else { - /* event remains in the queue */ + for (;;) { + cell = snd_seq_prioq_cell_out(q->tickq, + &q->timer->tick.cur_tick); + if (!cell) break; - } + snd_seq_dispatch_event(cell, atomic, hop); } - /* Process time queue... */ - while ((cell = snd_seq_prioq_cell_peek(q->timeq)) != NULL) { - if (snd_seq_compare_real_time(&q->timer->cur_time, - &cell->event.time.time)) { - cell = snd_seq_prioq_cell_out(q->timeq); - if (cell) - snd_seq_dispatch_event(cell, atomic, hop); - } else { - /* event remains in the queue */ + for (;;) { + cell = snd_seq_prioq_cell_out(q->timeq, &q->timer->cur_time); + if (!cell) break; - } + snd_seq_dispatch_event(cell, atomic, hop); } /* free lock */ -- 2.15.0

1 1

[alsa-devel] Applied "ASoC: core: Fix typo roup->group" to the asoc tree
by Mark Brown 09 Mar '18

09 Mar '18

The patch ASoC: core: Fix typo roup->group has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From f7e73b26aea58003931e2f3925d9c01f6b6c4c4d Mon Sep 17 00:00:00 2001 From: Mark Brown <broonie(a)kernel.org> Date: Fri, 9 Mar 2018 12:46:27 +0000 Subject: [PATCH] ASoC: core: Fix typo roup->group Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e1f047de599e..4cd32f1bceb4 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -221,14 +221,14 @@ static const struct attribute_group soc_dapm_dev_group = { .is_visible = soc_dev_attr_is_visible, }; -static const struct attribute_group soc_dev_roup = { +static const struct attribute_group soc_dev_group = { .attrs = soc_dev_attrs, .is_visible = soc_dev_attr_is_visible, }; static const struct attribute_group *soc_dev_attr_groups[] = { &soc_dapm_dev_group, - &soc_dev_roup, + &soc_dev_group, NULL }; -- 2.16.2

1 0