Commit 115c4556 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: azt2320: Fix assignment in if condition

ISA AZT2320 driver code contains lots of 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-14-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ce29edbd
...@@ -148,9 +148,11 @@ static int snd_card_azt2320_enable_wss(unsigned long port) ...@@ -148,9 +148,11 @@ static int snd_card_azt2320_enable_wss(unsigned long port)
{ {
int error; int error;
if ((error = snd_card_azt2320_command(port, 0x09))) error = snd_card_azt2320_command(port, 0x09);
if (error)
return error; return error;
if ((error = snd_card_azt2320_command(port, 0x00))) error = snd_card_azt2320_command(port, 0x00);
if (error)
return error; return error;
mdelay(5); mdelay(5);
...@@ -174,12 +176,14 @@ static int snd_card_azt2320_probe(int dev, ...@@ -174,12 +176,14 @@ static int snd_card_azt2320_probe(int dev,
return error; return error;
acard = card->private_data; acard = card->private_data;
if ((error = snd_card_azt2320_pnp(dev, acard, pcard, pid))) { error = snd_card_azt2320_pnp(dev, acard, pcard, pid);
if (error) {
snd_card_free(card); snd_card_free(card);
return error; return error;
} }
if ((error = snd_card_azt2320_enable_wss(port[dev]))) { error = snd_card_azt2320_enable_wss(port[dev]);
if (error) {
snd_card_free(card); snd_card_free(card);
return error; return error;
} }
...@@ -228,18 +232,21 @@ static int snd_card_azt2320_probe(int dev, ...@@ -228,18 +232,21 @@ static int snd_card_azt2320_probe(int dev,
snd_printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n", snd_printk(KERN_ERR PFX "no OPL device at 0x%lx-0x%lx\n",
fm_port[dev], fm_port[dev] + 2); fm_port[dev], fm_port[dev] + 2);
} else { } else {
if ((error = snd_opl3_timer_new(opl3, 1, 2)) < 0) { error = snd_opl3_timer_new(opl3, 1, 2);
if (error < 0) {
snd_card_free(card); snd_card_free(card);
return error; return error;
} }
if ((error = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) { error = snd_opl3_hwdep_new(opl3, 0, 1, NULL);
if (error < 0) {
snd_card_free(card); snd_card_free(card);
return error; return error;
} }
} }
} }
if ((error = snd_card_register(card)) < 0) { error = snd_card_register(card);
if (error < 0) {
snd_card_free(card); snd_card_free(card);
return error; return error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment