November 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] Broken child-node lookup in sound/soc/mediatek/mt8173
by Johan Hovold 13 Nov '17

13 Nov '17

Hi, I'm trying to fix up incorrect usage of of_find_node_by_name() to lookup child nodes, and found the following code in sound/soc/mediatek/mt8173/mt8173-rt5650.c: static int mt8173_rt5650_dev_probe(struct platform_device *pdev) { ... platform_node = of_parse_phandle(pdev->dev.of_node, "mediatek,platform", 0); ... if (of_find_node_by_name(platform_node, "codec-capture")) { np = of_get_child_by_name(pdev->dev.of_node, "codec-capture"); if (!np) { dev_err(&pdev->dev, "%s: Can't find codec-capture DT node\n", __func__); return -EINVAL; } ret = snd_soc_of_get_dai_name(np, &codec_capture_dai); if (ret < 0) { dev_err(&pdev->dev, "%s codec_capture_dai name fail %d\n", __func__, ret); return ret; } mt8173_rt5650_codecs[1].dai_name = codec_capture_dai; } added by commit d349caeb0510 ("ASoC: mediatek: Add second I2S on mt8173-rt5650 machine driver"). First of all the "codec-capture" node is indeed documented as a child node of the sound node, so the tree-wide depth-first search from the platform_node looks entirely bogus. Note that of_find_node_by_name() also drops a reference to its first argument, in this case the sound node, which could end up being prematurely freed. And then the reference to any returned codec-capture node (from either lookup) is never dropped. And since support for this second codec was added retrospectively and is documented as optional, that -EINVAL in case the node is missing looks broken too. I figured I better just report this one to the author of the patch and the maintainers to be straightened out. Thanks, Johan

1 0

[alsa-devel] [bug report] ASoC: Add EQ and filter to max98095 CODEC driver
by Dan Carpenter 13 Nov '17

13 Nov '17

[ This is an old patch. I'm working on some new Smatch stuff and I'm looking at this code, and I don't see how it's possible for this code to work. I must be missing something and it would help me if someone could explain to me what's going on so I can fix my software. - dan ] Hello Peter Hsiang, The patch dad31ec133ad: "ASoC: Add EQ and filter to max98095 CODEC driver" from Apr 19, 2011, leads to the following static checker warning: sound/soc/codecs/max98095.c:1524 max98095_put_eq_enum() warn: constraint overflow 'max98095->eq_texts' required = '(struct max98095_priv)->eq_textcnt' The error message is saying that Smatch expects we should verify that the index into the max98095->eq_texts[] array is less than max98095->eq_textcnt. sound/soc/codecs/max98095.c 1494 static int max98095_put_eq_enum(struct snd_kcontrol *kcontrol, 1495 struct snd_ctl_elem_value *ucontrol) 1496 { 1497 struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); 1498 struct max98095_priv *max98095 = snd_soc_codec_get_drvdata(codec); 1499 struct max98095_pdata *pdata = max98095->pdata; 1500 int channel = max98095_get_eq_channel(kcontrol->id.name); 1501 struct max98095_cdata *cdata; 1502 unsigned int sel = ucontrol->value.enumerated.item[0]; 1503 struct max98095_eq_cfg *coef_set; 1504 int fs, best, best_val, i; 1505 int regmask, regsave; 1506 1507 if (WARN_ON(channel > 1)) 1508 return -EINVAL; 1509 1510 if (!pdata || !max98095->eq_textcnt) ^^^^^^^^^^^^^^^^^^^^^ Here we check that max98095->eq_textcnt is non-zero. 1511 return 0; 1512 1513 if (sel >= pdata->eq_cfgcnt) ^^^^^^^^^^^^^^^^^^^^^^^ Check here 1514 return -EINVAL; 1515 1516 cdata = &max98095->dai[channel]; 1517 cdata->eq_sel = sel; 1518 fs = cdata->rate; 1519 1520 /* Find the selected configuration with nearest sample rate */ 1521 best = 0; 1522 best_val = INT_MAX; 1523 for (i = 0; i < pdata->eq_cfgcnt; i++) { ^^^^^^^^^^^^^^^^ According to Smatch the only place where pdata->eq_cfgcnt get set is from the assignment in max98095_i2c_probe() where we do: max98095->pdata = i2c->dev.platform_data; I don't know how i2c->dev.platform_data gets set. I would have thought it would just be a zeroed buffer. 1524 if (strcmp(pdata->eq_cfg[i].name, max98095->eq_texts[sel]) == 0 && ^^^^^^^^^^^^^ This is where the warning is generated. 1525 abs(pdata->eq_cfg[i].rate - fs) < best_val) { 1526 best = i; 1527 best_val = abs(pdata->eq_cfg[i].rate - fs); 1528 } 1529 } regards, dan carpenter

1 0

[alsa-devel] [PATCH] ALSA: aw2: Use common error handling code in three functions
by SF Markus Elfring 13 Nov '17

13 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Mon, 13 Nov 2017 09:49:15 +0100 Add jump targets so that a bit of exception handling can be better reused at the end of these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/pci/aw2/aw2-alsa.c | 85 +++++++++++++++++++++++------------------------- 1 file changed, 40 insertions(+), 45 deletions(-) diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c index 9a49e4243a9c..25710043c79d 100644 --- a/sound/pci/aw2/aw2-alsa.c +++ b/sound/pci/aw2/aw2-alsa.c @@ -261,13 +261,13 @@ static int snd_aw2_create(struct snd_card *card, if ((dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) || (dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)) < 0)) { dev_err(card->dev, "Impossible to set 32bit mask DMA\n"); - pci_disable_device(pci); - return -ENXIO; + err = -ENXIO; + goto disable_device; } chip = kzalloc(sizeof(*chip), GFP_KERNEL); if (chip == NULL) { - pci_disable_device(pci); - return -ENOMEM; + err = -ENOMEM; + goto disable_device; } /* initialize the stuff */ @@ -277,11 +277,9 @@ static int snd_aw2_create(struct snd_card *card, /* (1) PCI resource allocation */ err = pci_request_regions(pci, "Audiowerk2"); - if (err < 0) { - pci_disable_device(pci); - kfree(chip); - return err; - } + if (err < 0) + goto free_data; + chip->iobase_phys = pci_resource_start(pci, 0); chip->iobase_virt = ioremap_nocache(chip->iobase_phys, @@ -289,10 +287,8 @@ static int snd_aw2_create(struct snd_card *card, if (chip->iobase_virt == NULL) { dev_err(card->dev, "unable to remap memory region"); - pci_release_regions(pci); - pci_disable_device(pci); - kfree(chip); - return -ENOMEM; + err = -ENOMEM; + goto release_regions; } /* (2) initialization of the chip hardware */ @@ -301,23 +297,15 @@ static int snd_aw2_create(struct snd_card *card, if (request_irq(pci->irq, snd_aw2_saa7146_interrupt, IRQF_SHARED, KBUILD_MODNAME, chip)) { dev_err(card->dev, "Cannot grab irq %d\n", pci->irq); - - iounmap(chip->iobase_virt); - pci_release_regions(chip->pci); - pci_disable_device(chip->pci); - kfree(chip); - return -EBUSY; + err = -EBUSY; + goto unmap_io; } chip->irq = pci->irq; err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); if (err < 0) { free_irq(chip->irq, (void *)chip); - iounmap(chip->iobase_virt); - pci_release_regions(chip->pci); - pci_disable_device(chip->pci); - kfree(chip); - return err; + goto unmap_io; } *rchip = chip; @@ -325,6 +313,16 @@ static int snd_aw2_create(struct snd_card *card, dev_info(card->dev, "Audiowerk 2 sound card (saa7146 chipset) detected and managed\n"); return 0; + +unmap_io: + iounmap(chip->iobase_virt); +release_regions: + pci_release_regions(pci); +free_data: + kfree(chip); +disable_device: + pci_disable_device(pci); + return err; } /* constructor */ @@ -352,10 +350,8 @@ static int snd_aw2_probe(struct pci_dev *pci, /* (3) Create main component */ err = snd_aw2_create(card, pci, &chip); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; /* initialize mutex */ mutex_init(&chip->mtx); @@ -373,16 +369,18 @@ static int snd_aw2_probe(struct pci_dev *pci, /* (6) Register card instance */ err = snd_card_register(card); - if (err < 0) { - snd_card_free(card); - return err; - } + if (err < 0) + goto free_card; /* (7) Set PCI driver data */ pci_set_drvdata(pci, card); dev++; return 0; + +free_card: + snd_card_free(card); + return err; } /* destructor */ @@ -599,10 +597,8 @@ static int snd_aw2_new_pcm(struct aw2 *chip) err = snd_pcm_new(chip->card, "Audiowerk2 analog playback", 0, 1, 0, &pcm_playback_ana); - if (err < 0) { - dev_err(chip->card->dev, "snd_pcm_new error (0x%X)\n", err); - return err; - } + if (err < 0) + goto report_failure; /* Creation ok */ pcm_device = &chip->device_playback[NUM_STREAM_PLAYBACK_ANA]; @@ -636,11 +632,9 @@ static int snd_aw2_new_pcm(struct aw2 *chip) err = snd_pcm_new(chip->card, "Audiowerk2 digital playback", 1, 1, 0, &pcm_playback_num); + if (err < 0) + goto report_failure; - if (err < 0) { - dev_err(chip->card->dev, "snd_pcm_new error (0x%X)\n", err); - return err; - } /* Creation ok */ pcm_device = &chip->device_playback[NUM_STREAM_PLAYBACK_DIG]; @@ -673,11 +667,8 @@ static int snd_aw2_new_pcm(struct aw2 *chip) err = snd_pcm_new(chip->card, "Audiowerk2 capture", 2, 0, 1, &pcm_capture); - - if (err < 0) { - dev_err(chip->card->dev, "snd_pcm_new error (0x%X)\n", err); - return err; - } + if (err < 0) + goto report_failure; /* Creation ok */ pcm_device = &chip->device_capture[NUM_STREAM_CAPTURE_ANA]; @@ -718,6 +709,10 @@ static int snd_aw2_new_pcm(struct aw2 *chip) } return 0; + +report_failure: + dev_err(chip->card->dev, "snd_pcm_new error (0x%X)\n", err); + return err; } static int snd_aw2_control_switch_capture_info(struct snd_kcontrol *kcontrol, -- 2.15.0

1 0

[alsa-devel] [PATCH 0/6] ASoC: don't use codec hw_write - step [3/6]
by Kuninori Morimoto 13 Nov '17

13 Nov '17

Hi Mark These are 3/6 step of prepare patches for "replace component". Some codec drivers are using codec->hw_write, codec->control_data, but these are very redundant code, and component doesn't want to have such code. These patches cleanup it. You can check whole replace component patch-set on below. This is one of them Subject: Prepare to covert Codec/Platform into Component Date: Fri, 01 Sep 2017 14:18:11 +0900 Kuninori Morimoto (6): ASoC: don't use codec hw_write on uda1380 ASoC: don't use codec hw_write on tlv320dac33 ASoC: don't use codec hw_write on cx20442/omap-ams-delta ASoC: don't use codec hw_write on twl6040 ASoC: don't use codec hw_write on max98926 ASoC: don't use codec hw_write on max98927 sound/soc/codecs/cx20442.c | 23 ++++++++++------------- sound/soc/codecs/max98926.c | 2 +- sound/soc/codecs/max98927.c | 1 - sound/soc/codecs/tlv320dac33.c | 12 +++++------- sound/soc/codecs/twl6040.c | 16 ++++++++-------- sound/soc/codecs/uda1380.c | 20 ++++++++++---------- sound/soc/omap/ams-delta.c | 4 ++-- 7 files changed, 36 insertions(+), 42 deletions(-)

2 8

[alsa-devel] snd-hda-codec-hdmi option static_hdmi_pcm=1 causes glitchy audio
by VDR User 13 Nov '17

13 Nov '17

Hi. I was checking my surround sound setup with speaker-test and noticed that setting static_hdmi_pcm=1 for snd-hda-codec-hdmi causes audio to sound glitchy. Not sure what's going on there but thought I should report it. I'm using an Nvidia GT520 video card with audio/video being sent to my surround receiver via HDMI. Kernel 4.13.12, Debian Testing, nvidia driver 375.82 Thanks

1 0

[alsa-devel] [PATCH 0/2] ALSA: au88x0: Fine-tuning for some function implementations
by SF Markus Elfring 12 Nov '17

12 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sun, 12 Nov 2017 22:30:44 +0100 A few update suggestions were taken into account from static source code analysis. Markus Elfring (2): Adjust 40 function calls together with a variable assignment Use common error handling code in two functions sound/pci/au88x0/au88x0.c | 112 +++++++++++++++++++-------------------- sound/pci/au88x0/au88x0_a3d.c | 28 +++++----- sound/pci/au88x0/au88x0_core.c | 78 +++++++++++++-------------- sound/pci/au88x0/au88x0_eq.c | 21 +++++--- sound/pci/au88x0/au88x0_mixer.c | 3 +- sound/pci/au88x0/au88x0_mpu401.c | 14 ++--- sound/pci/au88x0/au88x0_pcm.c | 16 +++--- 7 files changed, 140 insertions(+), 132 deletions(-) -- 2.15.0

1 2

[alsa-devel] [PATCH] ALSA: als4000: Use common error handling code in snd_card_als4000_probe()
by SF Markus Elfring 12 Nov '17

12 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sun, 12 Nov 2017 13:50:48 +0100 * Adjust jump targets so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. * The script "checkpatch.pl" pointed information out like the following. ERROR: do not use assignment in if condition Thus fix eight affected source code places. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/pci/als4000.c | 90 ++++++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 43 deletions(-) diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c index 26b097edec8c..e63598c036f6 100644 --- a/sound/pci/als4000.c +++ b/sound/pci/als4000.c @@ -867,21 +867,22 @@ static int snd_card_als4000_probe(struct pci_dev *pci, } /* enable PCI device */ - if ((err = pci_enable_device(pci)) < 0) { + err = pci_enable_device(pci); + if (err < 0) return err; - } + /* check, if we can restrict PCI DMA transfers to 24 bits */ if (dma_set_mask(&pci->dev, DMA_BIT_MASK(24)) < 0 || dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(24)) < 0) { dev_err(&pci->dev, "architecture does not support 24bit PCI busmaster DMA\n"); - pci_disable_device(pci); - return -ENXIO; + err = -ENXIO; + goto disable_device; } - if ((err = pci_request_regions(pci, "ALS4000")) < 0) { - pci_disable_device(pci); - return err; - } + err = pci_request_regions(pci, "ALS4000"); + if (err < 0) + goto disable_device; + iobase = pci_resource_start(pci, 0); pci_read_config_word(pci, PCI_COMMAND, &word); @@ -893,8 +894,7 @@ static int snd_card_als4000_probe(struct pci_dev *pci, &card); if (err < 0) { pci_release_regions(pci); - pci_disable_device(pci); - return err; + goto disable_device; } acard = card->private_data; @@ -905,17 +905,18 @@ static int snd_card_als4000_probe(struct pci_dev *pci, /* disable all legacy ISA stuff */ snd_als4000_set_addr(acard->iobase, 0, 0, 0, 0); - if ((err = snd_sbdsp_create(card, - iobase + ALS4K_IOB_10_ADLIB_ADDR0, - pci->irq, + err = snd_sbdsp_create(card, + iobase + ALS4K_IOB_10_ADLIB_ADDR0, + pci->irq, /* internally registered as IRQF_SHARED in case of ALS4000 SB */ - snd_als4000_interrupt, - -1, - -1, - SB_HW_ALS4000, - &chip)) < 0) { - goto out_err; - } + snd_als4000_interrupt, + -1, + -1, + SB_HW_ALS4000, + &chip); + if (err < 0) + goto free_card; + acard->chip = chip; chip->pci = pci; @@ -928,14 +929,14 @@ static int snd_card_als4000_probe(struct pci_dev *pci, sprintf(card->longname, "%s at 0x%lx, irq %i", card->shortname, chip->alt_port, chip->irq); - if ((err = snd_mpu401_uart_new( card, 0, MPU401_HW_ALS4000, - iobase + ALS4K_IOB_30_MIDI_DATA, - MPU401_INFO_INTEGRATED | - MPU401_INFO_IRQ_HOOK, - -1, &chip->rmidi)) < 0) { + err = snd_mpu401_uart_new(card, 0, MPU401_HW_ALS4000, + iobase + ALS4K_IOB_30_MIDI_DATA, + MPU401_INFO_INTEGRATED | MPU401_INFO_IRQ_HOOK, + -1, &chip->rmidi); + if (err < 0) { dev_err(&pci->dev, "no MPU-401 device at 0x%lx?\n", iobase + ALS4K_IOB_30_MIDI_DATA); - goto out_err; + goto free_card; } /* FIXME: ALS4000 has interesting MPU401 configuration features * at ALS4K_CR1A_MPU401_UART_MODE_CONTROL @@ -943,12 +944,13 @@ static int snd_card_als4000_probe(struct pci_dev *pci, * however there doesn't seem to be an ALSA API for this... * SPECS_PAGE: 21 */ - if ((err = snd_als4000_pcm(chip, 0)) < 0) { - goto out_err; - } - if ((err = snd_sbmixer_new(chip)) < 0) { - goto out_err; - } + err = snd_als4000_pcm(chip, 0); + if (err < 0) + goto free_card; + + err = snd_sbmixer_new(chip); + if (err < 0) + goto free_card; if (snd_opl3_create(card, iobase + ALS4K_IOB_10_ADLIB_ADDR0, @@ -958,25 +960,27 @@ static int snd_card_als4000_probe(struct pci_dev *pci, iobase + ALS4K_IOB_10_ADLIB_ADDR0, iobase + ALS4K_IOB_12_ADLIB_ADDR2); } else { - if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) { - goto out_err; - } + err = snd_opl3_hwdep_new(opl3, 0, 1, NULL); + if (err < 0) + goto free_card; } snd_als4000_create_gameport(acard, dev); - if ((err = snd_card_register(card)) < 0) { - goto out_err; - } + err = snd_card_register(card); + if (err < 0) + goto free_card; + pci_set_drvdata(pci, card); dev++; - err = 0; - goto out; + return 0; -out_err: +disable_device: + pci_disable_device(pci); + return err; + +free_card: snd_card_free(card); - -out: return err; } -- 2.15.0

1 0

[alsa-devel] [PATCH] ALSA: als300: Use common error handling code in two functions
by SF Markus Elfring 12 Nov '17

12 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sun, 12 Nov 2017 12:52:50 +0100 * Add jump targets so that a bit of exception handling can be better reused at the end of these functions. This issue was detected by using the Coccinelle software. * The script "checkpatch.pl" pointed information out like the following. ERROR: do not use assignment in if condition Thus fix six affected source code places. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/pci/als300.c | 65 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/sound/pci/als300.c b/sound/pci/als300.c index eaa2d853d922..fd5ba75595cc 100644 --- a/sound/pci/als300.c +++ b/sound/pci/als300.c @@ -655,21 +655,22 @@ static int snd_als300_create(struct snd_card *card, }; *rchip = NULL; - if ((err = pci_enable_device(pci)) < 0) + err = pci_enable_device(pci); + if (err < 0) return err; if (dma_set_mask(&pci->dev, DMA_BIT_MASK(28)) < 0 || dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(28)) < 0) { dev_err(card->dev, "error setting 28bit DMA mask\n"); - pci_disable_device(pci); - return -ENXIO; + err = -ENXIO; + goto disable_device; } pci_set_master(pci); chip = kzalloc(sizeof(*chip), GFP_KERNEL); if (chip == NULL) { - pci_disable_device(pci); - return -ENOMEM; + err = -ENOMEM; + goto disable_device; } chip->card = card; @@ -678,10 +679,10 @@ static int snd_als300_create(struct snd_card *card, chip->chip_type = chip_type; spin_lock_init(&chip->reg_lock); - if ((err = pci_request_regions(pci, "ALS300")) < 0) { + err = pci_request_regions(pci, "ALS300"); + if (err < 0) { kfree(chip); - pci_disable_device(pci); - return err; + goto disable_device; } chip->port = pci_resource_start(pci, 0); @@ -693,8 +694,8 @@ static int snd_als300_create(struct snd_card *card, if (request_irq(pci->irq, irq_handler, IRQF_SHARED, KBUILD_MODNAME, chip)) { dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq); - snd_als300_free(chip); - return -EBUSY; + err = -EBUSY; + goto free_sound_chip; } chip->irq = pci->irq; @@ -704,24 +705,29 @@ static int snd_als300_create(struct snd_card *card, err = snd_als300_ac97(chip); if (err < 0) { dev_err(card->dev, "Could not create ac97\n"); - snd_als300_free(chip); - return err; + goto free_sound_chip; } - if ((err = snd_als300_new_pcm(chip)) < 0) { + err = snd_als300_new_pcm(chip); + if (err < 0) { dev_err(card->dev, "Could not create PCM\n"); - snd_als300_free(chip); - return err; + goto free_sound_chip; } - if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, - chip, &ops)) < 0) { - snd_als300_free(chip); - return err; - } + err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); + if (err < 0) + goto free_sound_chip; *rchip = chip; return 0; + +disable_device: + pci_disable_device(pci); + return err; + +free_sound_chip: + snd_als300_free(chip); + return err; } #ifdef CONFIG_PM_SLEEP @@ -776,11 +782,10 @@ static int snd_als300_probe(struct pci_dev *pci, return err; chip_type = pci_id->driver_data; + err = snd_als300_create(card, pci, chip_type, &chip); + if (err < 0) + goto free_card; - if ((err = snd_als300_create(card, pci, chip_type, &chip)) < 0) { - snd_card_free(card); - return err; - } card->private_data = chip; strcpy(card->driver, "ALS300"); @@ -794,13 +799,17 @@ static int snd_als300_probe(struct pci_dev *pci, sprintf(card->longname, "%s at 0x%lx irq %i", card->shortname, chip->port, chip->irq); - if ((err = snd_card_register(card)) < 0) { - snd_card_free(card); - return err; - } + err = snd_card_register(card); + if (err < 0) + goto free_card; + pci_set_drvdata(pci, card); dev++; return 0; + +free_card: + snd_card_free(card); + return err; } static struct pci_driver als300_driver = { -- 2.15.0

1 0

[alsa-devel] [PATCH] ALSA: ak4531_codec: Use common error handling code in snd_ak4531_mixer()
by SF Markus Elfring 12 Nov '17

12 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sun, 12 Nov 2017 10:56:19 +0100 * Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. * The script "checkpatch.pl" pointed information out like the following. ERROR: do not use assignment in if condition Thus fix three affected source code places. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/pci/ak4531_codec.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/sound/pci/ak4531_codec.c b/sound/pci/ak4531_codec.c index 2fb1fbba3e5e..208c96d6ae0f 100644 --- a/sound/pci/ak4531_codec.c +++ b/sound/pci/ak4531_codec.c @@ -399,10 +399,10 @@ int snd_ak4531_mixer(struct snd_card *card, return -ENOMEM; *ak4531 = *_ak4531; mutex_init(&ak4531->reg_mutex); - if ((err = snd_component_add(card, "AK4531")) < 0) { - snd_ak4531_free(ak4531); - return err; - } + err = snd_component_add(card, "AK4531"); + if (err < 0) + goto free_ac; + strcpy(card->mixername, "Asahi Kasei AK4531"); ak4531->write(ak4531, AK4531_RESET, 0x03); /* no RST, PD */ udelay(100); @@ -413,16 +413,16 @@ int snd_ak4531_mixer(struct snd_card *card, ak4531->write(ak4531, idx, ak4531->regs[idx] = snd_ak4531_initial_map[idx]); /* recording source is mixer */ } for (idx = 0; idx < ARRAY_SIZE(snd_ak4531_controls); idx++) { - if ((err = snd_ctl_add(card, snd_ctl_new1(&snd_ak4531_controls[idx], ak4531))) < 0) { - snd_ak4531_free(ak4531); - return err; - } + err = snd_ctl_add(card, + snd_ctl_new1(&snd_ak4531_controls[idx], + ak4531)); + if (err < 0) + goto free_ac; } snd_ak4531_proc_init(card, ak4531); - if ((err = snd_device_new(card, SNDRV_DEV_CODEC, ak4531, &ops)) < 0) { - snd_ak4531_free(ak4531); - return err; - } + err = snd_device_new(card, SNDRV_DEV_CODEC, ak4531, &ops); + if (err < 0) + goto free_ac; #if 0 snd_ak4531_dump(ak4531); @@ -430,6 +430,10 @@ int snd_ak4531_mixer(struct snd_card *card, if (rak4531) *rak4531 = ak4531; return 0; + +free_ac: + snd_ak4531_free(ak4531); + return err; } /* -- 2.15.0

2 1

[alsa-devel] [PATCH] ALSA: ad1889: Use common error handling code in snd_ad1889_create()
by SF Markus Elfring 12 Nov '17

12 Nov '17

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sun, 12 Nov 2017 10:10:53 +0100 * Adjust jump targets so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. * The script "checkpatch.pl" pointed information out like the following. ERROR: do not use assignment in if condition Thus fix five affected source code places. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/pci/ad1889.c | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index 0bf2c04eeada..9f00e63937a5 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c @@ -894,21 +894,23 @@ snd_ad1889_create(struct snd_card *card, *rchip = NULL; - if ((err = pci_enable_device(pci)) < 0) + err = pci_enable_device(pci); + if (err < 0) return err; /* check PCI availability (32bit DMA) */ if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0 || dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) { dev_err(card->dev, "error setting 32-bit DMA mask.\n"); - pci_disable_device(pci); - return -ENXIO; + err = -ENXIO; + goto disable_device; } /* allocate chip specific data with zero-filled memory */ - if ((chip = kzalloc(sizeof(*chip), GFP_KERNEL)) == NULL) { - pci_disable_device(pci); - return -ENOMEM; + chip = kzalloc(sizeof(*chip), GFP_KERNEL); + if (!chip) { + err = -ENOMEM; + goto disable_device; } chip->card = card; @@ -917,15 +919,16 @@ snd_ad1889_create(struct snd_card *card, chip->irq = -1; /* (1) PCI resource allocation */ - if ((err = pci_request_regions(pci, card->driver)) < 0) - goto free_and_ret; + err = pci_request_regions(pci, card->driver); + if (err < 0) + goto free_data; chip->bar = pci_resource_start(pci, 0); chip->iobase = pci_ioremap_bar(pci, 0); if (chip->iobase == NULL) { dev_err(card->dev, "unable to reserve region.\n"); err = -EBUSY; - goto free_and_ret; + goto free_data; } pci_set_master(pci); @@ -935,32 +938,34 @@ snd_ad1889_create(struct snd_card *card, if (request_irq(pci->irq, snd_ad1889_interrupt, IRQF_SHARED, KBUILD_MODNAME, chip)) { dev_err(card->dev, "cannot obtain IRQ %d\n", pci->irq); - snd_ad1889_free(chip); - return -EBUSY; + err = -EBUSY; + goto free_sound_chip; } chip->irq = pci->irq; synchronize_irq(chip->irq); /* (2) initialization of the chip hardware */ - if ((err = snd_ad1889_init(chip)) < 0) { - snd_ad1889_free(chip); - return err; - } + err = snd_ad1889_init(chip); + if (err < 0) + goto free_sound_chip; - if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) { - snd_ad1889_free(chip); - return err; - } + err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops); + if (err < 0) + goto free_sound_chip; *rchip = chip; return 0; -free_and_ret: +free_data: kfree(chip); +disable_device: pci_disable_device(pci); + return err; +free_sound_chip: + snd_ad1889_free(chip); return err; } -- 2.15.0

1 0