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

Re: [alsa-devel] Microphone detected, but no output for all ASUS G751xx with ALC668 chipset
by Håvard 12 Sep '18

12 Sep '18

I think this is right! I first booted up, then tested speakers (That I could not hear) and then tested microphone (Which worked perfectly) in windows settings. (My first email was dissaproved as it was too large) Den ons. 12. sep. 2018 kl. 19:05 skrev Håvard <hovardslill(a)gmail.com>: > I think this is right! > > I first booted up, then tested speakers (That I could not hear) and then > tested microphone (Which worked perfectly) in windows settings. > > -Håvard > > Den ons. 12. sep. 2018 kl. 18:49 skrev Connor McAdams < > conmanx360(a)gmail.com>: > >> Also, sorry to keep sending more replies, make sure the only trace you >> have on is vfio_region_write, and not the read one. The read spams up >> the console. >> >> On Wed, Sep 12, 2018 at 12:43 PM, Connor McAdams <conmanx360(a)gmail.com> >> wrote: >> > Reason being, it may not have identified the CORB buffer properly or >> > something. That's very odd to have no data. Never seen that before. >> > >> > On Wed, Sep 12, 2018 at 12:42 PM, Connor McAdams <conmanx360(a)gmail.com> >> wrote: >> >> Could you try again and make a copy of your terminal output? >> >> >> >> On Wed, Sep 12, 2018 at 12:41 PM, Håvard <hovardslill(a)gmail.com> >> wrote: >> >>> Hi again. >> >>> Sorry for not noticing all files were empty, did it not run for long >> enough? >> >>> >> >>> -Håvard >> >>> >> >>> Den ons. 12. sep. 2018 kl. 18:39 skrev Håvard <hovardslill(a)gmail.com >> >: >> >>>> >> >>>> Sorry my bad again it was working perfectly, just missed a step. >> >>>> >> >>>> I'll add the dumps as an attatchment. I had both external headset and >> >>>> microphone plugged in and let the VM run in the background for >> ~30min while >> >>>> doing other stuff. I did not play music or test my microphone in the >> VM >> >>>> either, If i did anything wrong, please tell me! >> >>>> >> >>>> It stopped at 0x104f4 >> >>>> >> >>>> -Håvard >> >>>> >> >>>> Den ons. 12. sep. 2018 kl. 00:31 skrev Connor McAdams >> >>>> <conmanx360(a)gmail.com>: >> >>>>> >> >>>>> Hm.... that's odd. They should show up in the folder you ran the >> >>>>> command from. Does your console show any "DumpMem entered..." or >> >>>>> something like that? You may have a permissions error. I've had some >> >>>>> people report that as an issue before. >> >>>>> >> >>>>> On Tue, Sep 11, 2018 at 5:08 PM, Håvard <hovardslill(a)gmail.com> >> wrote: >> >>>>> > Hi! >> >>>>> > >> >>>>> > Took a while, but I think I got it working. Did not see any >> "frame[xx]" >> >>>>> > files though. What dumps do you want? >> >>>>> > >> >>>>> > -Håvard >> >>>>> > >> >>>>> > Den tir. 11. sep. 2018 kl. 21:27 skrev Håvard < >> hovardslill(a)gmail.com>: >> >>>>> >> >> >>>>> >> Sorry about that, I forgot to enable a kernel config... >> >>>>> >> >> >>>>> >> -Håvard >> >>>>> >> >> >>>>> >> Den tir. 11. sep. 2018 kl. 21:20 skrev Connor McAdams >> >>>>> >> <conmanx360(a)gmail.com>: >> >>>>> >>> >> >>>>> >>> When it's bound as a stub, it shouldn't show up in alsamixer >> >>>>> >>> controls. >> >>>>> >>> You can check what module is loaded by doing lspci -v . It >> should say >> >>>>> >>> kernel driver in use: pci-stub. Also, did you run the vfio-bind >> >>>>> >>> script >> >>>>> >>> before trying it? >> >>>>> >>> >> >>>>> >>> On Tue, Sep 11, 2018 at 3:18 PM, Håvard <hovardslill(a)gmail.com> >> >>>>> >>> wrote: >> >>>>> >>> > Thank you for the offer! >> >>>>> >>> > >> >>>>> >>> > I run gentoo, but your github guide is very useful. I can't >> seem to >> >>>>> >>> > bind my >> >>>>> >>> > audio driver to a pci-stud. Is the Sound card still supposed >> to >> >>>>> >>> > function as >> >>>>> >>> > normal when I (think I) have bound it to a stud. >> >>>>> >>> > >> >>>>> >>> > -Håvard >> >>>>> >>> > >> >>>>> >>> > Den tir. 11. sep. 2018 kl. 20:26 skrev Connor McAdams >> >>>>> >>> > <conmanx360(a)gmail.com>: >> >>>>> >>> >> >> >>>>> >>> >> One thing you could try, is using the program I used to >> reverse >> >>>>> >>> >> engineer the Sound Blaster Z series of cards, QemuHDADump. >> If your >> >>>>> >>> >> processor supports pci-passthrough with a virtual machine, >> you >> >>>>> >>> >> could >> >>>>> >>> >> run a Windows virtual machine with the sound card in it and >> >>>>> >>> >> capture >> >>>>> >>> >> the commands. I'd be willing to look through the dumps to >> see if >> >>>>> >>> >> there >> >>>>> >>> >> are any special verbs or anything. >> >>>>> >>> >> >> >>>>> >>> >> You can find the program here: >> >>>>> >>> >> https://github.com/Conmanx360/QemuHDADump >> >>>>> >>> >> >> >>>>> >>> >> Let me know. >> >>>>> >>> >> >> >>>>> >>> >> On Tue, Sep 11, 2018 at 2:15 PM, Håvard < >> hovardslill(a)gmail.com> >> >>>>> >>> >> wrote: >> >>>>> >>> >> > Sorry, my gmail didn't update so I wrote my response >> before I >> >>>>> >>> >> > read >> >>>>> >>> >> > your >> >>>>> >>> >> > last one. >> >>>>> >>> >> > >> >>>>> >>> >> > It is a separate mic port as the G751JT doesn't have any >> headset >> >>>>> >>> >> > multijacks. >> >>>>> >>> >> > >> >>>>> >>> >> > I'll try and dig around in the kernel! Thanks for the tip! >> >>>>> >>> >> > >> >>>>> >>> >> > -Håvard >> >>>>> >>> >> > >> >>>>> >>> >> > Den tir. 11. sep. 2018 kl. 20:09 skrev Håvard >> >>>>> >>> >> > <hovardslill(a)gmail.com>: >> >>>>> >>> >> > >> >>>>> >>> >> >> Thank you for taking your time and trying to help! :) >> >>>>> >>> >> >> >> >>>>> >>> >> >> Do you know where I can ask around for more help on the >> issue? >> >>>>> >>> >> >> I >> >>>>> >>> >> >> don't >> >>>>> >>> >> >> want to give up yet. >> >>>>> >>> >> >> >> >>>>> >>> >> >> -Håvard >> >>>>> >>> >> >> >> >>>>> >>> >> >> Den tir. 11. sep. 2018 kl. 20:02 skrev Takashi Iwai >> >>>>> >>> >> >> <tiwai(a)suse.de>: >> >>>>> >>> >> >> >> >>>>> >>> >> >>> On Tue, 11 Sep 2018 19:14:37 +0200, >> >>>>> >>> >> >>> Håvard wrote: >> >>>>> >>> >> >>> > >> >>>>> >>> >> >>> > Yes, microphone gets detected instantly and it >> automatically >> >>>>> >>> >> >>> > changes >> >>>>> >>> >> >>> > to >> >>>>> >>> >> >>> it >> >>>>> >>> >> >>> > in pavucontrol. >> >>>>> >>> >> >>> >> >>>>> >>> >> >>> Then it likely requires some additional initialization >> outside >> >>>>> >>> >> >>> HD-audio. It's hard to know, as it's pretty much >> >>>>> >>> >> >>> vendor-specific. >> >>>>> >>> >> >>> You can dig down the Windows, but I have no idea about >> Windows >> >>>>> >>> >> >>> implementation, so can't give any hints, unfortunately. >> >>>>> >>> >> >>> >> >>>>> >>> >> >>> >> >>>>> >>> >> >>> Takashi >> >>>>> >>> >> >>> >> >>>>> >>> >> >>> > >> >>>>> >>> >> >>> > Den tir. 11. sep. 2018 kl. 18:52 skrev Takashi Iwai >> >>>>> >>> >> >>> > <tiwai(a)suse.de>: >> >>>>> >>> >> >>> > >> >>>>> >>> >> >>> > > On Tue, 11 Sep 2018 18:40:23 +0200, >> >>>>> >>> >> >>> > > Håvard wrote: >> >>>>> >>> >> >>> > > > >> >>>>> >>> >> >>> > > > Thank you for replying! >> >>>>> >>> >> >>> > > > >> >>>>> >>> >> >>> > > > Enabling loopback in alsamixer: >> >>>>> >>> >> >>> > > > http://i.imgur.com/lNo6e7T.png >> >>>>> >>> >> >>> > > > >> >>>>> >>> >> >>> > > > And unmuting more and more things in "Mic Playback >> >>>>> >>> >> >>> > > > Volume" >> >>>>> >>> >> >>> > > > in >> >>>>> >>> >> >>> > > hdaanalyzer: >> >>>>> >>> >> >>> > > > http://i.imgur.com/H0HiOhy.png >> >>>>> >>> >> >>> > > > made white noise come from the headset. However it >> did >> >>>>> >>> >> >>> > > > not >> >>>>> >>> >> >>> > > > change or >> >>>>> >>> >> >>> > > react >> >>>>> >>> >> >>> > > > at all when I talked or even muted the microphone >> >>>>> >>> >> >>> > > > physically. >> >>>>> >>> >> >>> > > > >> >>>>> >>> >> >>> > > > I couldn't find "Mic Playback Switch" anywhere in >> either >> >>>>> >>> >> >>> > > > alsamixer >> >>>>> >>> >> >>> or >> >>>>> >>> >> >>> > > > hdaanalyzer. >> >>>>> >>> >> >>> > > >> >>>>> >>> >> >>> > > It's a mixer mute switch. >> >>>>> >>> >> >>> > > >> >>>>> >>> >> >>> > > > The microphone works perfectly fine under Windows, >> so I >> >>>>> >>> >> >>> > > > don't >> >>>>> >>> >> >>> > > > think >> >>>>> >>> >> >>> it is >> >>>>> >>> >> >>> > > > the mic pin. >> >>>>> >>> >> >>> > > >> >>>>> >>> >> >>> > > But the fact above indicates the possibility of the >> wrong >> >>>>> >>> >> >>> > > pin, >> >>>>> >>> >> >>> > > too. >> >>>>> >>> >> >>> > > >> >>>>> >>> >> >>> > > Does the jack detection of the ext mic pin work? >> >>>>> >>> >> >>> > > >> >>>>> >>> >> >>> > > >> >>>>> >>> >> >>> > > Takashi >> >>>>> >>> >> >>> > > >> >>>>> >>> >> >>> > > > >> >>>>> >>> >> >>> > > > -Håvard >> >>>>> >>> >> >>> > > > >> >>>>> >>> >> >>> > > > Den man. 10. sep. 2018 kl. 22:39 skrev Takashi Iwai >> >>>>> >>> >> >>> > > > <tiwai(a)suse.de >> >>>>> >>> >> >>> >: >> >>>>> >>> >> >>> > > > >> >>>>> >>> >> >>> > > > > On Thu, 06 Sep 2018 20:44:30 +0200, >> >>>>> >>> >> >>> > > > > Håvard wrote: >> >>>>> >>> >> >>> > > > > > >> >>>>> >>> >> >>> > > > > > Additional relevant info: >> >>>>> >>> >> >>> > > > > > >> >>>>> >>> >> >>> > > > > > A similar issue was also discussed three years >> ago >> >>>>> >>> >> >>> > > > > > on >> >>>>> >>> >> >>> > > > > > Sun >> >>>>> >>> >> >>> > > > > > Jun >> >>>>> >>> >> >>> > > 17:15:54 >> >>>>> >>> >> >>> > > > > CEST >> >>>>> >>> >> >>> > > > > > 2015 and was about his surround sound setup, >> but did >> >>>>> >>> >> >>> > > > > > not >> >>>>> >>> >> >>> > > > > > touch >> >>>>> >>> >> >>> on the >> >>>>> >>> >> >>> > > > > > external microphone problem: >> >>>>> >>> >> >>> > > > > > >> >>>>> >>> >> >>> > > > > >> >>>>> >>> >> >>> > > >> >>>>> >>> >> >>> >> >>>>> >>> >> >>> >> >>>>> >>> >> >>> >> >>>>> >>> >> >>> >> http://mailman.alsa-project.org/pipermail/alsa-devel/2015-June/093317.html >> >>>>> >>> >> >>> > > > > > >> >>>>> >>> >> >>> > > > > > alsa-info.sh: >> >>>>> >>> >> >>> > > > > > >> >>>>> >>> >> >>> > > > > >> >>>>> >>> >> >>> > > >> >>>>> >>> >> >>> >> >>>>> >>> >> >>> >> >>>>> >>> >> >>> >> >>>>> >>> >> >>> >> http://www.alsa-project.org/db/?f=1d8616ba5977308e03db6c3a86e36e9e9b38d6f0 >> >>>>> >>> >> >>> > > > > > >> >>>>> >>> >> >>> > > > > > Graph of ALC668 chipset from hdaanalyzer: >> >>>>> >>> >> >>> > > > > > http://i.imgur.com/c08DNJW.png >> >>>>> >>> >> >>> > > > > > >> >>>>> >>> >> >>> > > > > > setting alsa-mode[1-8] does nothing to help the >> >>>>> >>> >> >>> > > > > > issue. >> >>>>> >>> >> >>> > > > > > >> >>>>> >>> >> >>> > > > > > There are several of similar bug reports >> around the >> >>>>> >>> >> >>> > > > > > web >> >>>>> >>> >> >>> experiencing >> >>>>> >>> >> >>> > > > > > similar issues, and on different distros. >> >>>>> >>> >> >>> > > > > > >> >>>>> >>> >> >>> > > > > > Microphone works perfectly in windows >> >>>>> >>> >> >>> > > > > > >> >>>>> >>> >> >>> > > > > > I have a ASUS ROG G751JT, but this problem >> seems to >> >>>>> >>> >> >>> > > > > > happen >> >>>>> >>> >> >>> > > > > > with >> >>>>> >>> >> >>> all >> >>>>> >>> >> >>> > > > > laptops >> >>>>> >>> >> >>> > > > > > under the G751 name. >> >>>>> >>> >> >>> > > > > >> >>>>> >>> >> >>> > > > > When you enable the loopback volume and switch, >> and >> >>>>> >>> >> >>> > > > > unmute/adjust >> >>>>> >>> >> >>> "Mic >> >>>>> >>> >> >>> > > > > Playback Volume", and "Mic Playback Switch", do >> you >> >>>>> >>> >> >>> > > > > hear >> >>>>> >>> >> >>> > > > > the >> >>>>> >>> >> >>> > > > > input >> >>>>> >>> >> >>> > > > > from the ext mic? It's a route directly from >> NID 0x18 >> >>>>> >>> >> >>> > > > > to >> >>>>> >>> >> >>> > > > > the >> >>>>> >>> >> >>> mixer >> >>>>> >>> >> >>> > > > > NID 0x0b, then output mixer NID 0x0c, then >> outputs. >> >>>>> >>> >> >>> > > > > So >> >>>>> >>> >> >>> > > > > this >> >>>>> >>> >> >>> > > > > can >> >>>>> >>> >> >>> be >> >>>>> >>> >> >>> > > > > used to verify the hardware routing. >> >>>>> >>> >> >>> > > > > >> >>>>> >>> >> >>> > > > > If you don't hear via this route, it means that >> the >> >>>>> >>> >> >>> > > > > input >> >>>>> >>> >> >>> > > > > from >> >>>>> >>> >> >>> the ext >> >>>>> >>> >> >>> > > > > mic pin itself is broken, and it implies that >> >>>>> >>> >> >>> > > > > something >> >>>>> >>> >> >>> > > > > outside >> >>>>> >>> >> >>> > > > > HD-audio codec. >> >>>>> >>> >> >>> > > > > >> >>>>> >>> >> >>> > > > > >> >>>>> >>> >> >>> > > > > Takashi >> >>>>> >>> >> >>> > > > > >> >>>>> >>> >> >>> > > > [2 <text/html; UTF-8 (quoted-printable)>] >> >>>>> >>> >> >>> > > > >> >>>>> >>> >> >>> > > >> >>>>> >>> >> >>> > [2 <text/html; UTF-8 (quoted-printable)>] >> >>>>> >>> >> >>> > >> >>>>> >>> >> >>> >> >>>>> >>> >> >> >> >>>>> >>> >> > _______________________________________________ >> >>>>> >>> >> > Alsa-devel mailing list >> >>>>> >>> >> > Alsa-devel(a)alsa-project.org >> >>>>> >>> >> > >> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >> >

1 0

Re: [alsa-devel] Microphone detected, but no output for all ASUS G751xx with ALC668 chipset
by Håvard 12 Sep '18

12 Sep '18

Additional relevant info: A similar issue was also discussed three years ago on Sun Jun 17:15:54 CEST 2015 and was about his surround sound setup, but did not touch on the external microphone problem: http://mailman.alsa-project.org/pipermail/alsa-devel/2015-June/093317.html alsa-info.sh: http://www.alsa-project.org/db/?f=1d8616ba5977308e03db6c3a86e36e9e9b38d6f0 Graph of ALC668 chipset from hdaanalyzer: http://i.imgur.com/c08DNJW.png setting alsa-mode[1-8] does nothing to help the issue. There are several of similar bug reports around the web experiencing similar issues, and on different distros. Microphone works perfectly in windows I have a ASUS ROG G751JT, but this problem seems to happen with all laptops under the G751 name. These are my kernel configs: https://paste.pound-python.org/show/GRk4T6xNvmdp8W7K9slJ/ Thank you! -Håvard

3 19

[alsa-devel] [PATCH] ASoC: pxa: remove duplicated snd_soc_component_driver ops
by petrcvekcz＠gmail.com 11 Sep '18

11 Sep '18

From: Petr Cvek <petrcvekcz(a)gmail.com> The sound soc drivers which are using a platform driver pxa-pcm-audio and cpu dai drivers from the pxa tree have defined pxa2xx_soc_pcm_new() twice. The function will get called in soc_new_pcm() for two components (platform and cpu dai) which causes a double allocation of DMA resources and later during a close of the playback/capture a kernel warning: WARNING: CPU: 0 PID: 892 at drivers/dma/dmaengine.c:788 dma_release_channel+0x44/0xa0 chan reference count 0 != 1 Modules linked in: snd_soc_magician snd_soc_pxa2xx snd_pxa2xx_lib ... CPU: 0 PID: 892 Comm: aplay Tainted: G C 4.18.0-rc6-next-20180726-magician+ #16 Hardware name: HTC Magician [<c0107d90>] (unwind_backtrace) from [<c010594c>] (show_stack+0x10/0x14) [<c010594c>] (show_stack) from [<c0111680>] (__warn+0xd4/0xec) [<c0111680>] (__warn) from [<c01112d0>] (warn_slowpath_fmt+0x44/0x6c) [<c01112d0>] (warn_slowpath_fmt) from [<c034908c>] (dma_release_channel+0x44/0xa0) [<c034908c>] (dma_release_channel) from [<bf330528>] (snd_dmaengine_pcm_close_release_chan+0x44/0xb1c [snd_pcm_dmaengine]) [<bf330528>] (snd_dmaengine_pcm_close_release_chan [snd_pcm_dmaengine]) from [<bf26c29c>] (soc_pcm_components_close+0x8c/0xac [snd_soc_core]) [<bf26c29c>] (soc_pcm_components_close [snd_soc_core]) from [<bf26c3a0>] (soc_pcm_close+0xe4/0xd44 [snd_soc_core]) [<bf26c3a0>] (soc_pcm_close [snd_soc_core]) from [<bf167254>] (snd_pcm_release_substream+0x88/0x108 [snd_pcm]) [<bf167254>] (snd_pcm_release_substream [snd_pcm]) from [<bf167330>] (snd_pcm_release+0x5c/0xd2c [snd_pcm]) [<bf167330>] (snd_pcm_release [snd_pcm]) from [<c01c39e4>] (__fput+0xdc/0x1e8) [<c01c39e4>] (__fput) from [<c0129e7c>] (task_work_run+0xc4/0xd4) [<c0129e7c>] (task_work_run) from [<c01053ac>] (do_work_pending+0xc0/0xc8) [<c01053ac>] (do_work_pending) from [<c0101068>] (slow_work_pending+0xc/0x20) Exception stack(0xc2fdffb0 to 0xc2fdfff8) ffa0: 00000000 0154d1a0 01542a3c 00000000 ffc0: 0154d150 00000000 0009283c 00000006 000003f0 0154d4c8 00000000 0154d4c8 ffe0: b6ee7d70 bef13960 b6e547b8 b6cfe018 60000010 00000004 The problem was found for cpu dai drivers: pxa-i2s and pxa-ssp and by a calltrace sent from Robert Jarzmik on pxa-ac97 (although there was no observed kernel warning). The git grep shows these 3 cpu dai drivers are the only one which assign the .pcm_new to pxa2xx_soc_pcm_new() and almost every machine which is using one of these cpu dai drivers is using the platform driver pxa-pcm-audio too. The only exception is TTC_DKB board which is using a platform driver mmp-pcm-audio. A quick look in the code of mmp-pcm-audio shows it allocates the DMA in the similar way as PXA. The solution is to remove one of pxa2xx_soc_pcm_new() assignments and the patch does it for 3 cpu dai drivers (SSP/I2S/AC97). The result was tested on HTC Magician board (SSP for playback, I2S for capture) and the DMA buffers are correctly allocated. Signed-off-by: Petr Cvek <petrcvekcz(a)gmail.com> --- sound/soc/pxa/pxa-ssp.c | 3 --- sound/soc/pxa/pxa2xx-ac97.c | 3 --- sound/soc/pxa/pxa2xx-i2s.c | 3 --- 3 files changed, 9 deletions(-) diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c index 69033e1a84e6..9689a1552d53 100644 --- a/sound/soc/pxa/pxa-ssp.c +++ b/sound/soc/pxa/pxa-ssp.c @@ -867,9 +867,6 @@ static struct snd_soc_dai_driver pxa_ssp_dai = { static const struct snd_soc_component_driver pxa_ssp_component = { .name = "pxa-ssp", - .ops = &pxa2xx_pcm_ops, - .pcm_new = pxa2xx_soc_pcm_new, - .pcm_free = pxa2xx_pcm_free_dma_buffers, }; #ifdef CONFIG_OF diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 9f779657bc86..c52b33802bf2 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -214,9 +214,6 @@ static struct snd_soc_dai_driver pxa_ac97_dai_driver[] = { static const struct snd_soc_component_driver pxa_ac97_component = { .name = "pxa-ac97", - .ops = &pxa2xx_pcm_ops, - .pcm_new = pxa2xx_soc_pcm_new, - .pcm_free = pxa2xx_pcm_free_dma_buffers, }; #ifdef CONFIG_OF diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index 42820121e5b9..e7184de0de04 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -364,9 +364,6 @@ static struct snd_soc_dai_driver pxa_i2s_dai = { static const struct snd_soc_component_driver pxa_i2s_component = { .name = "pxa-i2s", - .ops = &pxa2xx_pcm_ops, - .pcm_new = pxa2xx_soc_pcm_new, - .pcm_free = pxa2xx_pcm_free_dma_buffers, }; static int pxa2xx_i2s_drv_probe(struct platform_device *pdev) -- 2.18.0

2 2

[alsa-devel] [PATCH 03/11] compat_ioctl: remove translation for sound ioctls
by Arnd Bergmann 11 Sep '18

11 Sep '18

The SNDCTL_* and SOUND_* commands are the old OSS user interface. I checked all the sound ioctl commands listed in fs/compat_ioctl.c to see if we still need the translation handlers. Here is what I found: - sound/oss/ is (almost) gone from the kernel, this is what actually needed all the translations - The ALSA emulation for OSS correctly handles all compat_ioctl commands already. - sound/oss/dmasound/ is the last holdout of the original OSS code, this is only used on arch/m68k, which has no 64-bit mode and hence needs no compat handlers - arch/um/drivers/hostaudio_kern.c may run in 64-bit mode with 32-bit x86 user space underneath it. This rare corner case is the only one that still needs the compat handlers. By adding a simple redirect of .compat_ioctl to .unlocked_ioctl in the UML driver, we can remove all the COMPATIBLE_IOCTL() annotations without a change in functionality. For completeness, I'm adding the same thing to the dmasound file, knowing that it makes no difference. The compat_ioctl list contains one comment about SNDCTL_DSP_MAPINBUF and SNDCTL_DSP_MAPOUTBUF, which actually would need a translation handler if implemented. However, the native implementation just returns -EINVAL, so we don't care. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- arch/um/drivers/hostaudio_kern.c | 1 + fs/compat_ioctl.c | 157 ----------------------------- sound/core/oss/pcm_oss.c | 4 + sound/oss/dmasound/dmasound_core.c | 2 + 4 files changed, 7 insertions(+), 157 deletions(-) diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c index 7f9dbdbc4eb7..0278a642a622 100644 --- a/arch/um/drivers/hostaudio_kern.c +++ b/arch/um/drivers/hostaudio_kern.c @@ -298,6 +298,7 @@ static const struct file_operations hostaudio_fops = { .write = hostaudio_write, .poll = hostaudio_poll, .unlocked_ioctl = hostaudio_ioctl, + .compat_ioctl = hostaudio_ioctl, .mmap = NULL, .open = hostaudio_open, .release = hostaudio_release, diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index c2c73b802fb3..875516658c39 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -78,7 +78,6 @@ #include <linux/if_bonding.h> #include <linux/watchdog.h> -#include <linux/soundcard.h> #include <linux/lp.h> #include <linux/ppdev.h> @@ -605,162 +604,6 @@ COMPATIBLE_IOCTL(SG_GET_KEEP_ORPHAN) /* PPP stuff */ COMPATIBLE_IOCTL(PPPIOCGUNIT) COMPATIBLE_IOCTL(PPPIOCGCHAN) -/* Big A */ -/* sparc only */ -/* Big Q for sound/OSS */ -COMPATIBLE_IOCTL(SNDCTL_SEQ_RESET) -COMPATIBLE_IOCTL(SNDCTL_SEQ_SYNC) -COMPATIBLE_IOCTL(SNDCTL_SYNTH_INFO) -COMPATIBLE_IOCTL(SNDCTL_SEQ_CTRLRATE) -COMPATIBLE_IOCTL(SNDCTL_SEQ_GETOUTCOUNT) -COMPATIBLE_IOCTL(SNDCTL_SEQ_GETINCOUNT) -COMPATIBLE_IOCTL(SNDCTL_SEQ_PERCMODE) -COMPATIBLE_IOCTL(SNDCTL_FM_LOAD_INSTR) -COMPATIBLE_IOCTL(SNDCTL_SEQ_TESTMIDI) -COMPATIBLE_IOCTL(SNDCTL_SEQ_RESETSAMPLES) -COMPATIBLE_IOCTL(SNDCTL_SEQ_NRSYNTHS) -COMPATIBLE_IOCTL(SNDCTL_SEQ_NRMIDIS) -COMPATIBLE_IOCTL(SNDCTL_MIDI_INFO) -COMPATIBLE_IOCTL(SNDCTL_SEQ_THRESHOLD) -COMPATIBLE_IOCTL(SNDCTL_SYNTH_MEMAVL) -COMPATIBLE_IOCTL(SNDCTL_FM_4OP_ENABLE) -COMPATIBLE_IOCTL(SNDCTL_SEQ_PANIC) -COMPATIBLE_IOCTL(SNDCTL_SEQ_OUTOFBAND) -COMPATIBLE_IOCTL(SNDCTL_SEQ_GETTIME) -COMPATIBLE_IOCTL(SNDCTL_SYNTH_ID) -COMPATIBLE_IOCTL(SNDCTL_SYNTH_CONTROL) -COMPATIBLE_IOCTL(SNDCTL_SYNTH_REMOVESAMPLE) -/* Big T for sound/OSS */ -COMPATIBLE_IOCTL(SNDCTL_TMR_TIMEBASE) -COMPATIBLE_IOCTL(SNDCTL_TMR_START) -COMPATIBLE_IOCTL(SNDCTL_TMR_STOP) -COMPATIBLE_IOCTL(SNDCTL_TMR_CONTINUE) -COMPATIBLE_IOCTL(SNDCTL_TMR_TEMPO) -COMPATIBLE_IOCTL(SNDCTL_TMR_SOURCE) -COMPATIBLE_IOCTL(SNDCTL_TMR_METRONOME) -COMPATIBLE_IOCTL(SNDCTL_TMR_SELECT) -/* Little m for sound/OSS */ -COMPATIBLE_IOCTL(SNDCTL_MIDI_PRETIME) -COMPATIBLE_IOCTL(SNDCTL_MIDI_MPUMODE) -COMPATIBLE_IOCTL(SNDCTL_MIDI_MPUCMD) -/* Big P for sound/OSS */ -COMPATIBLE_IOCTL(SNDCTL_DSP_RESET) -COMPATIBLE_IOCTL(SNDCTL_DSP_SYNC) -COMPATIBLE_IOCTL(SNDCTL_DSP_SPEED) -COMPATIBLE_IOCTL(SNDCTL_DSP_STEREO) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETBLKSIZE) -COMPATIBLE_IOCTL(SNDCTL_DSP_CHANNELS) -COMPATIBLE_IOCTL(SOUND_PCM_WRITE_FILTER) -COMPATIBLE_IOCTL(SNDCTL_DSP_POST) -COMPATIBLE_IOCTL(SNDCTL_DSP_SUBDIVIDE) -COMPATIBLE_IOCTL(SNDCTL_DSP_SETFRAGMENT) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETFMTS) -COMPATIBLE_IOCTL(SNDCTL_DSP_SETFMT) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETOSPACE) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETISPACE) -COMPATIBLE_IOCTL(SNDCTL_DSP_NONBLOCK) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETCAPS) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETTRIGGER) -COMPATIBLE_IOCTL(SNDCTL_DSP_SETTRIGGER) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETIPTR) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETOPTR) -/* SNDCTL_DSP_MAPINBUF, XXX needs translation */ -/* SNDCTL_DSP_MAPOUTBUF, XXX needs translation */ -COMPATIBLE_IOCTL(SNDCTL_DSP_SETSYNCRO) -COMPATIBLE_IOCTL(SNDCTL_DSP_SETDUPLEX) -COMPATIBLE_IOCTL(SNDCTL_DSP_GETODELAY) -COMPATIBLE_IOCTL(SNDCTL_DSP_PROFILE) -COMPATIBLE_IOCTL(SOUND_PCM_READ_RATE) -COMPATIBLE_IOCTL(SOUND_PCM_READ_CHANNELS) -COMPATIBLE_IOCTL(SOUND_PCM_READ_BITS) -COMPATIBLE_IOCTL(SOUND_PCM_READ_FILTER) -/* Big C for sound/OSS */ -COMPATIBLE_IOCTL(SNDCTL_COPR_RESET) -COMPATIBLE_IOCTL(SNDCTL_COPR_LOAD) -COMPATIBLE_IOCTL(SNDCTL_COPR_RDATA) -COMPATIBLE_IOCTL(SNDCTL_COPR_RCODE) -COMPATIBLE_IOCTL(SNDCTL_COPR_WDATA) -COMPATIBLE_IOCTL(SNDCTL_COPR_WCODE) -COMPATIBLE_IOCTL(SNDCTL_COPR_RUN) -COMPATIBLE_IOCTL(SNDCTL_COPR_HALT) -COMPATIBLE_IOCTL(SNDCTL_COPR_SENDMSG) -COMPATIBLE_IOCTL(SNDCTL_COPR_RCVMSG) -/* Big M for sound/OSS */ -COMPATIBLE_IOCTL(SOUND_MIXER_READ_VOLUME) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_BASS) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_TREBLE) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_SYNTH) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_PCM) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_SPEAKER) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_LINE) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_MIC) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_CD) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_IMIX) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_ALTPCM) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_RECLEV) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_IGAIN) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_OGAIN) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_LINE1) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_LINE2) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_LINE3) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_DIGITAL1)) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_DIGITAL2)) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_DIGITAL3)) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_PHONEIN)) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_PHONEOUT)) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_VIDEO)) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_RADIO)) -COMPATIBLE_IOCTL(MIXER_READ(SOUND_MIXER_MONITOR)) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_MUTE) -/* SOUND_MIXER_READ_ENHANCE, same value as READ_MUTE */ -/* SOUND_MIXER_READ_LOUD, same value as READ_MUTE */ -COMPATIBLE_IOCTL(SOUND_MIXER_READ_RECSRC) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_DEVMASK) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_RECMASK) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_STEREODEVS) -COMPATIBLE_IOCTL(SOUND_MIXER_READ_CAPS) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_VOLUME) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_BASS) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_TREBLE) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_SYNTH) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_PCM) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_SPEAKER) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_LINE) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_MIC) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_CD) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_IMIX) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_ALTPCM) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_RECLEV) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_IGAIN) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_OGAIN) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_LINE1) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_LINE2) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_LINE3) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_DIGITAL1)) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_DIGITAL2)) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_DIGITAL3)) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_PHONEIN)) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_PHONEOUT)) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_VIDEO)) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_RADIO)) -COMPATIBLE_IOCTL(MIXER_WRITE(SOUND_MIXER_MONITOR)) -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_MUTE) -/* SOUND_MIXER_WRITE_ENHANCE, same value as WRITE_MUTE */ -/* SOUND_MIXER_WRITE_LOUD, same value as WRITE_MUTE */ -COMPATIBLE_IOCTL(SOUND_MIXER_WRITE_RECSRC) -COMPATIBLE_IOCTL(SOUND_MIXER_INFO) -COMPATIBLE_IOCTL(SOUND_OLD_MIXER_INFO) -COMPATIBLE_IOCTL(SOUND_MIXER_ACCESS) -COMPATIBLE_IOCTL(SOUND_MIXER_AGC) -COMPATIBLE_IOCTL(SOUND_MIXER_3DSE) -COMPATIBLE_IOCTL(SOUND_MIXER_PRIVATE1) -COMPATIBLE_IOCTL(SOUND_MIXER_PRIVATE2) -COMPATIBLE_IOCTL(SOUND_MIXER_PRIVATE3) -COMPATIBLE_IOCTL(SOUND_MIXER_PRIVATE4) -COMPATIBLE_IOCTL(SOUND_MIXER_PRIVATE5) -COMPATIBLE_IOCTL(SOUND_MIXER_GETLEVELS) -COMPATIBLE_IOCTL(SOUND_MIXER_SETLEVELS) -COMPATIBLE_IOCTL(OSS_GETVERSION) /* Raw devices */ COMPATIBLE_IOCTL(RAW_SETBIND) COMPATIBLE_IOCTL(RAW_GETBIND) diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index f8d4a419f3af..3f25c9d7b7df 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -2732,6 +2732,10 @@ static long snd_pcm_oss_ioctl(struct file *file, unsigned int cmd, unsigned long static long snd_pcm_oss_ioctl_compat(struct file *file, unsigned int cmd, unsigned long arg) { + /* + * Everything is compatbile except SNDCTL_DSP_MAPINBUF/SNDCTL_DSP_MAPOUTBUF, + * which are not implemented for the native case either + */ return snd_pcm_oss_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); } #else diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c index fc9bcd47d6a4..b6b5f5a5df9c 100644 --- a/sound/oss/dmasound/dmasound_core.c +++ b/sound/oss/dmasound/dmasound_core.c @@ -384,6 +384,7 @@ static const struct file_operations mixer_fops = .owner = THIS_MODULE, .llseek = no_llseek, .unlocked_ioctl = mixer_unlocked_ioctl, + .compat_ioctl = mixer_unlocked_ioctl, .open = mixer_open, .release = mixer_release, }; @@ -1167,6 +1168,7 @@ static const struct file_operations sq_fops = .write = sq_write, .poll = sq_poll, .unlocked_ioctl = sq_unlocked_ioctl, + .compat_ioctl = sq_unlocked_ioctl, .open = sq_open, .release = sq_release, }; -- 2.18.0

2 2

[alsa-devel] [PATCH] ASoC: rt5668: remove empty rt5668_i2c_remove()
by Kuninori Morimoto 11 Sep '18

11 Sep '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> rt5668_i2c_remove() is empty, and no longer needed. Let's remove it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/codecs/rt5668.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sound/soc/codecs/rt5668.c b/sound/soc/codecs/rt5668.c index 4412cd2..85ba04d 100644 --- a/sound/soc/codecs/rt5668.c +++ b/sound/soc/codecs/rt5668.c @@ -2591,11 +2591,6 @@ static int rt5668_i2c_probe(struct i2c_client *i2c, rt5668_dai, ARRAY_SIZE(rt5668_dai)); } -static int rt5668_i2c_remove(struct i2c_client *i2c) -{ - return 0; -} - static void rt5668_i2c_shutdown(struct i2c_client *client) { struct rt5668_priv *rt5668 = i2c_get_clientdata(client); @@ -2626,7 +2621,6 @@ static struct i2c_driver rt5668_i2c_driver = { .acpi_match_table = ACPI_PTR(rt5668_acpi_match), }, .probe = rt5668_i2c_probe, - .remove = rt5668_i2c_remove, .shutdown = rt5668_i2c_shutdown, .id_table = rt5668_i2c_id, }; -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: soc-core: avoid nested code on soc_remove_dai()
by Kuninori Morimoto 11 Sep '18

11 Sep '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Nested code is not readable. This patch avoid it on soc_remove_dai(). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/soc-core.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index c8c73c6..41fef33 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -938,17 +938,18 @@ static void soc_remove_dai(struct snd_soc_dai *dai, int order) { int err; - if (dai && dai->probed && - dai->driver->remove_order == order) { - if (dai->driver->remove) { - err = dai->driver->remove(dai); - if (err < 0) - dev_err(dai->dev, - "ASoC: failed to remove %s: %d\n", - dai->name, err); - } - dai->probed = 0; + if (!dai || !dai->probed || + dai->driver->remove_order != order) + return; + + if (dai->driver->remove) { + err = dai->driver->remove(dai); + if (err < 0) + dev_err(dai->dev, + "ASoC: failed to remove %s: %d\n", + dai->name, err); } + dai->probed = 0; } static void soc_remove_link_dais(struct snd_soc_card *card, -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: soc-core: remove unused num_dai_links
by Kuninori Morimoto 11 Sep '18

11 Sep '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ALSA SoC is counting card->dai_link_list user, but no-one is using it. Let's remove it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- include/sound/soc.h | 1 - sound/soc/soc-core.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 821bf99..e17a7ae 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1060,7 +1060,6 @@ struct snd_soc_card { struct snd_soc_dai_link *dai_link; /* predefined links only */ int num_links; /* predefined links only */ struct list_head dai_link_list; /* all links */ - int num_dai_links; struct list_head rtd_list; int num_rtd; diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 1f859cc..f43c532 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1009,7 +1009,6 @@ static void soc_remove_dai_links(struct snd_soc_card *card) link->name); list_del(&link->list); - card->num_dai_links--; } } @@ -1185,7 +1184,6 @@ int snd_soc_add_dai_link(struct snd_soc_card *card, card->add_dai_link(card, dai_link); list_add_tail(&dai_link->list, &card->dai_link_list); - card->num_dai_links++; return 0; } @@ -1223,7 +1221,6 @@ void snd_soc_remove_dai_link(struct snd_soc_card *card, list_for_each_entry_safe(link, _link, &card->dai_link_list, list) { if (link == dai_link) { list_del(&link->list); - card->num_dai_links--; return; } } @@ -2710,7 +2707,6 @@ int snd_soc_register_card(struct snd_soc_card *card) snd_soc_initialize_card_lists(card); INIT_LIST_HEAD(&card->dai_link_list); - card->num_dai_links = 0; INIT_LIST_HEAD(&card->rtd_list); card->num_rtd = 0; -- 2.7.4

2 1

[alsa-devel] [PATCH] ALSA: hda: fix unused variable warning
by Anders Roxell 11 Sep '18

11 Sep '18

When CONFIG_X86=n function azx_snoop doesn't use the variable chip it only returns true. sound/pci/hda/hda_intel.c: In function ‘dma_alloc_pages’: sound/pci/hda/hda_intel.c:2002:14: warning: unused variable ‘chip’ [-Wunused-variable] struct azx *chip = bus_to_azx(bus); ^~~~ Create a inline function of azx_snoop. Fixes: a41d122449be ("ALSA: hda - Embed bus into controller object") Signed-off-by: Anders Roxell <anders.roxell(a)linaro.org> --- sound/pci/hda/hda_controller.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/hda_controller.h b/sound/pci/hda/hda_controller.h index 0053b704ddc4..aa20048742d0 100644 --- a/sound/pci/hda/hda_controller.h +++ b/sound/pci/hda/hda_controller.h @@ -170,11 +170,10 @@ struct azx { #define azx_bus(chip) (&(chip)->bus.core) #define bus_to_azx(_bus) container_of(_bus, struct azx, bus.core) -#ifdef CONFIG_X86 -#define azx_snoop(chip) ((chip)->snoop) -#else -#define azx_snoop(chip) true -#endif +static inline bool azx_snoop(struct azx *chip) +{ + return IS_ENABLED(CONFIG_X86) || (chip->snoop); +} /* * macros for easy use -- 2.18.0

2 4

[alsa-devel] Applied "ASoC: dapm: Fix a couple uninitialized ret variables" to the asoc tree
by Mark Brown 11 Sep '18

11 Sep '18

The patch ASoC: dapm: Fix a couple uninitialized ret variables 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 2e558a8127de7b2ed3302f9adcf332ba3feeadb2 Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter(a)oracle.com> Date: Fri, 7 Sep 2018 22:40:33 +0300 Subject: [PATCH] ASoC: dapm: Fix a couple uninitialized ret variables Smatch complains that these variables could be uninitialized. The first one in snd_soc_dai_link_event() is probably a false positive, because probably we know the lists are not empty. I would normally ignore the warning, but GCC complains here as well so I just silenced the warning. The "ret" in snd_soc_dapm_new_dai() does need to be initialized or it leads to a bogus dereference in the caller. Fixes: 3bbf5d34fd4a ("ASoC: dapm: Move error handling to snd_soc_dapm_new_control_unlocked") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-dapm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index e496bc642c99..0dcdcc23dcfd 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3938,8 +3938,10 @@ snd_soc_dapm_new_dai(struct snd_soc_card *card, struct snd_soc_pcm_runtime *rtd, dev_dbg(card->dev, "ASoC: adding %s widget\n", link_name); w = snd_soc_dapm_new_control_unlocked(&card->dapm, &template); - if (IS_ERR(w)) + if (IS_ERR(w)) { + ret = PTR_ERR(w); goto outfree_kcontrol_news; + } w->priv = rtd; -- 2.19.0.rc1

1 1

[alsa-devel] Applied "ASoC: qdsp6: q6asm-dai: clean up a return" to the asoc tree
by Mark Brown 11 Sep '18

11 Sep '18

The patch ASoC: qdsp6: q6asm-dai: clean up a return 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 0712e0288b7602efbde95d95bca4c651ccad01b8 Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter(a)oracle.com> Date: Mon, 10 Sep 2018 11:40:48 +0300 Subject: [PATCH] ASoC: qdsp6: q6asm-dai: clean up a return Smatch complains that if both "psubstream" and "csubstream" are NULL then "ret" is uninitialized. That probably can't happen, but it's cleaner to just return zero anyway so let's do that. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> Acked-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/qcom/qdsp6/q6asm-dai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/qcom/qdsp6/q6asm-dai.c b/sound/soc/qcom/qdsp6/q6asm-dai.c index 9db9a2944ef2..c75fab38905d 100644 --- a/sound/soc/qcom/qdsp6/q6asm-dai.c +++ b/sound/soc/qcom/qdsp6/q6asm-dai.c @@ -493,7 +493,7 @@ static int q6asm_dai_pcm_new(struct snd_soc_pcm_runtime *rtd) } } - return ret; + return 0; } static void q6asm_dai_pcm_free(struct snd_pcm *pcm) -- 2.19.0.rc2

1 0