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

[alsa-devel] [PATCH] ASoC: cs4271: Fix build error without CONFIG_SPI_MASTER
by Takashi Iwai 06 Mar '14

06 Mar '14

cs4271_common_probe() is called from cs4271_i2c_probe() but defined in CONFIG_SPI_MASTER block, thus it results in a build error when CONFIG_SPI_MASTER=n: sound/soc/codecs/cs4271.c:721:2: error: implicit declaration of function ‘cs4271_common_probe’ [-Werror=implicit-function-declaration] Move the function out of #if block. Fixes: d6cf89ee07cb ('ASoC: cs4271: claim reset GPIO in bus probe function') Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/soc/codecs/cs4271.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sound/soc/codecs/cs4271.c b/sound/soc/codecs/cs4271.c index 96c309777208..aef4965750c7 100644 --- a/sound/soc/codecs/cs4271.c +++ b/sound/soc/codecs/cs4271.c @@ -612,22 +612,6 @@ static struct snd_soc_codec_driver soc_codec_dev_cs4271 = { .num_dapm_routes = ARRAY_SIZE(cs4271_dapm_routes), }; -#if defined(CONFIG_SPI_MASTER) - -static const struct regmap_config cs4271_spi_regmap = { - .reg_bits = 16, - .val_bits = 8, - .max_register = CS4271_LASTREG, - .read_flag_mask = 0x21, - .write_flag_mask = 0x20, - - .reg_defaults = cs4271_reg_defaults, - .num_reg_defaults = ARRAY_SIZE(cs4271_reg_defaults), - .cache_type = REGCACHE_RBTREE, - - .volatile_reg = cs4271_volatile_reg, -}; - static int cs4271_common_probe(struct device *dev, struct cs4271_private **c) { @@ -658,6 +642,22 @@ static int cs4271_common_probe(struct device *dev, return 0; } +#if defined(CONFIG_SPI_MASTER) + +static const struct regmap_config cs4271_spi_regmap = { + .reg_bits = 16, + .val_bits = 8, + .max_register = CS4271_LASTREG, + .read_flag_mask = 0x21, + .write_flag_mask = 0x20, + + .reg_defaults = cs4271_reg_defaults, + .num_reg_defaults = ARRAY_SIZE(cs4271_reg_defaults), + .cache_type = REGCACHE_RBTREE, + + .volatile_reg = cs4271_volatile_reg, +}; + static int cs4271_spi_probe(struct spi_device *spi) { struct cs4271_private *cs4271; -- 1.9.0

4 3

[alsa-devel] [patch] ASoC: Baytrail: fix error handling in sst_byt_dsp_init()
by Dan Carpenter 06 Mar '14

06 Mar '14

Calling "kfree(byt)" is a double free because that was allocated with devm_kzalloc(). There were a couple places which leak "byt->msg". That memory is allocated in msg_empty_list_init(). Fixes: f7d01fd6754c ('ASoC: Intel: Add Intel Baytrail SST DSP IPC support') Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/soc/intel/sst-baytrail-ipc.c b/sound/soc/intel/sst-baytrail-ipc.c index c12e194bbc6b..d0eaeee21be4 100644 --- a/sound/soc/intel/sst-baytrail-ipc.c +++ b/sound/soc/intel/sst-baytrail-ipc.c @@ -796,7 +796,7 @@ int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata) err = msg_empty_list_init(byt); if (err < 0) - goto list_err; + return -ENOMEM; /* start the IPC message thread */ init_kthread_worker(&byt->kworker); @@ -806,7 +806,7 @@ int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata) if (IS_ERR(byt->tx_thread)) { err = PTR_ERR(byt->tx_thread); dev_err(byt->dev, "error failed to create message TX task\n"); - goto list_err; + goto err_free_msg; } init_kthread_work(&byt->kwork, sst_byt_ipc_tx_msgs); @@ -816,7 +816,7 @@ int sst_byt_dsp_init(struct device *dev, struct sst_pdata *pdata) byt->dsp = sst_dsp_new(dev, &byt_dev, pdata); if (byt->dsp == NULL) { err = -ENODEV; - goto list_err; + goto err_free_msg; } /* keep the DSP in reset state for base FW loading */ @@ -848,9 +848,9 @@ boot_err: sst_fw_free(byt_sst_fw); fw_err: sst_dsp_free(byt->dsp); +err_free_msg: kfree(byt->msg); -list_err: - kfree(byt); + return err; } EXPORT_SYMBOL_GPL(sst_byt_dsp_init);

3 2

[alsa-devel] UCM: How does its api relate to ALSA lib api?
by kaweka 05 Mar '14

05 Mar '14

Hi, I am a newcomer if it goes to following topics: ALSA, audio in Linux, audio in embedded Linux. However several years of experience in audio development on other platforms. As next a development of audio applications in embedded Linux is the task. However have few gaps in understanding of the audio system architecture. It would be helpful to have answers to following questions. For any hints lot of thanks in advance! * There is well-known handshaking application-ALSA lib based on amonst others snd_pcm_open snd_pcm_hw_params_alloca snd_pcm_hw_params_any snd_pcm_hw_params_set_... snd_pcm_hw_params snd_pcm_hw_params_get_... snd_pcm_hw_params_is_... snd_pcm_hw_params_can_... snd_pcm_close * Does the UCM and its api complement the api and handshaking as above. Or is it rather a question of replacement? * If neither nor, how to describe best the relation between UCM api and ALSA lib api? * How does the entire handshaking application-audio system look like if to use ALSA and UCM api? * An use case seems to be just a container for verb, device, modifier. Is an use case introducing any functionality to be found neither in verb, nor in device, nor in modifier? * For what reason does the term / definition of use case exists at all. Will verb, device, modifier not be enough? * What is the difference between switching to other use case and modifying a use case? Why not to switch to other use case in situations where modifier is used? * QoS api seems to introduce some redundancy. If voice, or music, or other - this information can be gathered from use case. A use case does already read voice, music, other! Why is qos api necessary? Best Regards kaweka

1 0

[alsa-devel] Add "cval->res = 384" quirk for Logitech Webcam C500
by Simon 05 Mar '14

05 Mar '14

Hello, Since some time I am successfully using this workaround http://mailman.alsa-project.org/pipermail/alsa-devel/2011-March/037657.html to solve the problem for the Logitech C500 Webcam (046d:0807). Would it be possible to add this device to the list included in the mixer.c file? Thanks

2 1

[alsa-devel] [patch] ALSA: echoaudio: use after free on error
by Dan Carpenter 05 Mar '14

05 Mar '14

There are some places where we dereference "chip" in the error message but we've already freed it. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 166ec0c120d4..9f10c9e0df5e 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c @@ -1990,8 +1990,8 @@ static int snd_echo_create(struct snd_card *card, if ((chip->iores = request_mem_region(chip->dsp_registers_phys, sz, ECHOCARD_NAME)) == NULL) { - snd_echo_free(chip); dev_err(chip->card->dev, "cannot get memory region\n"); + snd_echo_free(chip); return -EBUSY; } chip->dsp_registers = (volatile u32 __iomem *) @@ -1999,8 +1999,8 @@ static int snd_echo_create(struct snd_card *card, if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED, KBUILD_MODNAME, chip)) { - snd_echo_free(chip); dev_err(chip->card->dev, "cannot grab irq\n"); + snd_echo_free(chip); return -EBUSY; } chip->irq = pci->irq; @@ -2012,8 +2012,8 @@ static int snd_echo_create(struct snd_card *card, if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci), sizeof(struct comm_page), &chip->commpage_dma_buf) < 0) { - snd_echo_free(chip); dev_err(chip->card->dev, "cannot allocate the comm page\n"); + snd_echo_free(chip); return -ENOMEM; } chip->comm_page_phys = chip->commpage_dma_buf.addr; @@ -2291,8 +2291,8 @@ static int snd_echo_resume(struct device *dev) if (request_irq(pci->irq, snd_echo_interrupt, IRQF_SHARED, KBUILD_MODNAME, chip)) { - snd_echo_free(chip); dev_err(chip->card->dev, "cannot grab irq\n"); + snd_echo_free(chip); return -EBUSY; } chip->irq = pci->irq;

3 3

Re: [alsa-devel] [GIT PULL v2] Enhancement of support for Firewire devices
by Takashi Iwai 05 Mar '14

05 Mar '14

At Wed, 05 Mar 2014 12:13:03 +0900, Takashi Sakamoto wrote: > > This pull-request is an update for my previous pull-request: > [alsa-devel] [GIT PULL][PATCH 00/39] Enhancement of support for Firewire > devices > http://mailman.alsa-project.org/pipermail/alsa-devel/2014-February/073446.h… > > Updates since previous pull-request: > firewire-lib: > - use swap() instead of local macro > - check NULL at memory allocation for sort table > fireworks: > - use bitmap.h for card slots > - add 'firewire' subdirectory for card node in procfs > - add sanity check of module parameter with clamp() > bebob: > - use bitmap.h for card slots > - add 'firewire' subdirectory for card node in procfs > - simplify codes for metering > - use swap() instead of local macro > - change order of last two commits Could you submit v2 patches to ML? The patches need review, and I want get them acked by Clemens before applying. thanks, Takashi > > ---------------------------------------------------------------- > The following changes since commit 31278997add61ee13b709e274934c7b0085accce: > > ALSA: hda/realtek - Add headset quirk for Dell DT (2014-03-03 10:48:55 > +0100) > > are available in the git repository at: > > https://github.com/takaswie/sound.git request > > for you to fetch changes up to 5b354e20ec3c64fa0a8fa7fbc7355201d881a8cc: > > bebob: Send a cue to load firmware for M-Audio Firewire series > (2014-03-05 12:00:32 +0900) > > ---------------------------------------------------------------- > Takashi Sakamoto (39): > firewire-lib: Rename functions, structure, member for AMDTP > firewire-lib: Add macros instead of fixed value for AMDTP > firewire-lib: Add 'direction' member to 'amdtp_stream' structure > firewire-lib: Split some codes into functions to reuse for both > streams > firewire-lib: Add support for AMDTP in-stream and PCM capture > firewire-lib: Add support for MIDI capture/playback > firewire-lib: Give syt value as parameter to handle_out_packet() > firewire-lib: Add support for duplex streams synchronization in > blocking mode > firewire-lib: Add sort function for transmitted packet > firewire-lib: Add transfer delay to synchronized duplex streams > firewire-lib: Add support for channel mapping > firewire-lib: Rename macros, variables and functions for CMP > firewire-lib: Add 'direction' member to 'cmp_connection' structure > firewire-lib: Add handling output connection by CMP > firewire-lib: Add a new function to check others' connection > firewire-lib: Add some AV/C general commands > firewire-lib: Add quirks for Fireworks > firewire-lib: Add a fallback at RCODE_CANCELLED > fireworks: Add skelton for Fireworks based devices > fireworks: Add transaction and some commands > fireworks: Add connection and stream management > fireworks: Add proc interface for debugging purpose > fireworks: Add MIDI interface > fireworks: Add PCM interface > fireworks: Add hwdep interface > fireworks: Add command/response functionality into hwdep interface > bebob: Add skelton for BeBoB based devices > bebob: Add commands and connections/streams management > bebob: Add proc interface for debugging purpose > bebob: Add MIDI interface > bebob: Add PCM interface > bebob: Add hwdep interface > bebob: Prepare for device specific operations > bebob: Add support for Terratec PHASE, EWS series and Aureon > bebob: Add support for Yamaha GO series > bebob: Add support for Focusrite Saffire/SaffirePro series > bebob: Add support for M-Audio usual Firewire series > bebob: Add support for M-Audio special Firewire series > bebob: Send a cue to load firmware for M-Audio Firewire series > > include/uapi/sound/asound.h | 4 +- > include/uapi/sound/firewire.h | 22 +- > sound/firewire/Kconfig | 59 ++ > sound/firewire/Makefile | 2 + > sound/firewire/amdtp.c | 891 > +++++++++++++++++------ > sound/firewire/amdtp.h | 175 ++++- > sound/firewire/bebob/Makefile | 4 + > sound/firewire/bebob/bebob.c | 450 ++++++++++++ > sound/firewire/bebob/bebob.h | 260 +++++++ > sound/firewire/bebob/bebob_command.c | 354 +++++++++ > sound/firewire/bebob/bebob_focusrite.c | 287 ++++++++ > sound/firewire/bebob/bebob_hwdep.c | 197 +++++ > sound/firewire/bebob/bebob_maudio.c | 828 > +++++++++++++++++++++ > sound/firewire/bebob/bebob_midi.c | 170 +++++ > sound/firewire/bebob/bebob_pcm.c | 451 ++++++++++++ > sound/firewire/bebob/bebob_proc.c | 201 +++++ > sound/firewire/bebob/bebob_stream.c | 869 > ++++++++++++++++++++++ > sound/firewire/bebob/bebob_terratec.c | 68 ++ > sound/firewire/bebob/bebob_yamaha.c | 50 ++ > sound/firewire/cmp.c | 229 ++++-- > sound/firewire/cmp.h | 14 +- > sound/firewire/dice.c | 46 +- > sound/firewire/fcp.c | 160 +++- > sound/firewire/fcp.h | 21 + > sound/firewire/fireworks/Makefile | 4 + > sound/firewire/fireworks/fireworks.c | 326 +++++++++ > sound/firewire/fireworks/fireworks.h | 223 ++++++ > sound/firewire/fireworks/fireworks_command.c | 397 ++++++++++ > sound/firewire/fireworks/fireworks_hwdep.c | 294 ++++++++ > sound/firewire/fireworks/fireworks_midi.c | 179 +++++ > sound/firewire/fireworks/fireworks_pcm.c | 477 ++++++++++++ > sound/firewire/fireworks/fireworks_proc.c | 233 ++++++ > sound/firewire/fireworks/fireworks_stream.c | 337 +++++++++ > sound/firewire/fireworks/fireworks_transaction.c | 327 +++++++++ > sound/firewire/lib.c | 6 +- > sound/firewire/lib.h | 1 + > sound/firewire/speakers.c | 93 +-- > 37 files changed, 8307 insertions(+), 402 deletions(-) > create mode 100644 sound/firewire/bebob/Makefile > create mode 100644 sound/firewire/bebob/bebob.c > create mode 100644 sound/firewire/bebob/bebob.h > create mode 100644 sound/firewire/bebob/bebob_command.c > create mode 100644 sound/firewire/bebob/bebob_focusrite.c > create mode 100644 sound/firewire/bebob/bebob_hwdep.c > create mode 100644 sound/firewire/bebob/bebob_maudio.c > create mode 100644 sound/firewire/bebob/bebob_midi.c > create mode 100644 sound/firewire/bebob/bebob_pcm.c > create mode 100644 sound/firewire/bebob/bebob_proc.c > create mode 100644 sound/firewire/bebob/bebob_stream.c > create mode 100644 sound/firewire/bebob/bebob_terratec.c > create mode 100644 sound/firewire/bebob/bebob_yamaha.c > create mode 100644 sound/firewire/fireworks/Makefile > create mode 100644 sound/firewire/fireworks/fireworks.c > create mode 100644 sound/firewire/fireworks/fireworks.h > create mode 100644 sound/firewire/fireworks/fireworks_command.c > create mode 100644 sound/firewire/fireworks/fireworks_hwdep.c > create mode 100644 sound/firewire/fireworks/fireworks_midi.c > create mode 100644 sound/firewire/fireworks/fireworks_pcm.c > create mode 100644 sound/firewire/fireworks/fireworks_proc.c > create mode 100644 sound/firewire/fireworks/fireworks_stream.c > create mode 100644 sound/firewire/fireworks/fireworks_transaction.c >

2 3

[alsa-devel] [PATCH] ALSA: emu10k1: Fix possible NULL dereference
by Takashi Iwai 05 Mar '14

05 Mar '14

The previous dev_err() conversion resulted in a code that may give NULL dereference in snd_emu10k1_ptr_write(). Since it's a sanity check, better to be replaced with a debug macro like other places in this driver. Fixes: 6f002b02166c ('ALSA: emu10k1: Use standard printk helpers') Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/emu10k1/io.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c index 81c75b4528d9..706b4f0c6806 100644 --- a/sound/pci/emu10k1/io.c +++ b/sound/pci/emu10k1/io.c @@ -71,11 +71,8 @@ void snd_emu10k1_ptr_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned i unsigned long flags; unsigned int mask; - if (!emu) { - dev_err(emu->card->dev, "ptr_write: emu is null!\n"); - dump_stack(); + if (snd_BUG_ON(!emu)) return; - } mask = emu->audigy ? A_PTR_ADDRESS_MASK : PTR_ADDRESS_MASK; regptr = ((reg << 16) & mask) | (chn & PTR_CHANNELNUM_MASK); -- 1.9.0

1 0

[alsa-devel] [patch] ALSA: lola: NULL deref on allocation error
by Dan Carpenter 05 Mar '14

05 Mar '14

"chip" is NULL here. We don't need a printk here because kmalloc() has it built in. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/sound/pci/lola/lola.c b/sound/pci/lola/lola.c index d63434d8c3fb..68824cdd137d 100644 --- a/sound/pci/lola/lola.c +++ b/sound/pci/lola/lola.c @@ -586,7 +586,6 @@ static int lola_create(struct snd_card *card, struct pci_dev *pci, chip = kzalloc(sizeof(*chip), GFP_KERNEL); if (!chip) { - dev_err(chip->card->dev, "cannot allocate chip\n"); pci_disable_device(pci); return -ENOMEM; }

2 1

Re: [alsa-devel] ALSA: emu10k1: Use standard printk helpers
by Dan Carpenter 05 Mar '14

05 Mar '14

Hello Takashi Iwai, The patch 6f002b02166c: "ALSA: emu10k1: Use standard printk helpers" from Feb 25, 2014, leads to the following static checker warning: sound/pci/emu10k1/io.c:75 snd_emu10k1_ptr_write() error: we previously assumed 'emu' could be null (see line 74) sound/pci/emu10k1/io.c 68 void snd_emu10k1_ptr_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned int chn, unsigned int data) 69 { 70 unsigned int regptr; 71 unsigned long flags; 72 unsigned int mask; 73 74 if (!emu) { ^^^^ 75 dev_err(emu->card->dev, "ptr_write: emu is null!\n"); ^^^^^^^^^^^^^^ Dereference. 76 dump_stack(); 77 return; 78 } regards, dan carpenter

2 1

[alsa-devel] [PATCH 1/2] ALSA: hda - Add missing loopback merge path for AD1884/1984 codecs
by Takashi Iwai 05 Mar '14

05 Mar '14

The mixer widget (NID 0x20) of AD1884 and AD1984 codecs isn't connected directly to the actual I/O paths but only via another mixer widget (NID 0x21). We need a similar fix as we did for AD1882. Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_analog.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index df3652ad15ef..498971095869 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -1092,6 +1092,7 @@ static int patch_ad1884(struct hda_codec *codec) spec = codec->spec; spec->gen.mixer_nid = 0x20; + spec->gen.mixer_merge_nid = 0x21; spec->gen.beep_nid = 0x10; set_beep_amp(spec, 0x10, 0, HDA_OUTPUT); -- 1.9.0

1 1