bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

ALSA: nm256: Fix assignment in if condition

Browse source 
PCI NM256 driver code contains a few assignments in if condition,
which is a bad coding style that may confuse readers and occasionally
lead to bugs.

This patch is merely for coding-style fixes, no functional changes.

Link: https://lore.kernel.org/r/20210608140540.17885-46-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2021-06-08 16:05:19 +02:00
parent 73debecf8f
commit 36f74c7ff9
1 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
sound/pci/nm256/nm256.c
View file

@ -1318,7 +1318,8 @@ snd_nm256_mixer(struct nm256 *chip)
if (! chip->ac97_regs) if (! chip->ac97_regs)
return -ENOMEM; return -ENOMEM;
if ((err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus)) < 0) err = snd_ac97_bus(chip->card, 0, &ops, NULL, &pbus);
if (err < 0)
return err; return err;
memset(&ac97, 0, sizeof(ac97)); memset(&ac97, 0, sizeof(ac97));
@ -1476,7 +1477,8 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci,
*chip_ret = NULL; *chip_ret = NULL;
if ((err = pci_enable_device(pci)) < 0) err = pci_enable_device(pci);
if (err < 0)
return err; return err;
chip = kzalloc(sizeof(*chip), GFP_KERNEL); chip = kzalloc(sizeof(*chip), GFP_KERNEL);
@ -1568,7 +1570,8 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci,
chip->buffer_end = buffer_top; chip->buffer_end = buffer_top;
else { else {
/* get buffer end pointer from signature */ /* get buffer end pointer from signature */
if ((err = snd_nm256_peek_for_sig(chip)) < 0) err = snd_nm256_peek_for_sig(chip);
if (err < 0)
goto __error; goto __error;
} }
@ -1618,7 +1621,8 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci,
// pci_set_master(pci); /* needed? */ // pci_set_master(pci); /* needed? */
if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
if (err < 0)
goto __error; goto __error;
*chip_ret = chip; *chip_ret = chip;
@ -1700,7 +1704,8 @@ static int snd_nm256_probe(struct pci_dev *pci,
capture_bufsize = 4; capture_bufsize = 4;
if (capture_bufsize > 128) if (capture_bufsize > 128)
capture_bufsize = 128; capture_bufsize = 128;
if ((err = snd_nm256_create(card, pci, &chip)) < 0) { err = snd_nm256_create(card, pci, &chip);
if (err < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }
@ -1716,8 +1721,13 @@ static int snd_nm256_probe(struct pci_dev *pci,
chip->reset_workaround_2 = 1; chip->reset_workaround_2 = 1;
} }
if ((err = snd_nm256_pcm(chip, 0)) < 0 || err = snd_nm256_pcm(chip, 0);
(err = snd_nm256_mixer(chip)) < 0) { if (err < 0) {
snd_card_free(card);
return err;
}
err = snd_nm256_mixer(chip);
if (err < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }
@ -1727,7 +1737,8 @@ static int snd_nm256_probe(struct pci_dev *pci,
card->shortname, card->shortname,
chip->buffer_addr, chip->cport_addr, chip->irq); chip->buffer_addr, chip->cport_addr, chip->irq);
if ((err = snd_card_register(card)) < 0) { err = snd_card_register(card);
if (err < 0) {
snd_card_free(card); snd_card_free(card);
return err; return err;
} }