author: Takashi Iwai <tiwai@suse.de> 2021-06-08 16:05:32 +0200
committer: Takashi Iwai <tiwai@suse.de> 2021-06-09 17:30:29 +0200
commit: bdab9e5c3eb3a633903ae423587fa9bf67555b69
parent: 2073fa449d6d2ac52d511fad4bce121fd284a7f3
Commit Summary:
Diffstat:
3 files changed, 21 insertions, 14 deletions
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index d24ae00878f5..c434b69a83f1 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -975,8 +975,9 @@ static int snd_amd7930_create(struct snd_card *card,
spin_unlock_irqrestore(&amd->lock, flags);
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
- amd, &snd_amd7930_dev_ops)) < 0) {
+ err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
+ amd, &snd_amd7930_dev_ops);
+ if (err < 0) {
snd_amd7930_free(amd);
return err;
}
@@ -1019,13 +1020,16 @@ static int amd7930_sbus_probe(struct platform_device *op)
irq, dev_num, &amd)) < 0)
goto out_err;
- if ((err = snd_amd7930_pcm(amd)) < 0)
+ err = snd_amd7930_pcm(amd);
+ if (err < 0)
goto out_err;
- if ((err = snd_amd7930_mixer(amd)) < 0)
+ err = snd_amd7930_mixer(amd);
+ if (err < 0)
goto out_err;
- if ((err = snd_card_register(card)) < 0)
+ err = snd_card_register(card);
+ if (err < 0)
goto out_err;
amd->next = amd7930_list;
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 35c17803a430..2942c8c7a236 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -1828,8 +1828,9 @@ static int snd_cs4231_sbus_create(struct snd_card *card,
}
snd_cs4231_init(chip);
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
- chip, &snd_cs4231_sbus_dev_ops)) < 0) {
+ err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
+ chip, &snd_cs4231_sbus_dev_ops);
+ if (err < 0) {
snd_cs4231_sbus_free(chip);
return err;
}
@@ -2020,8 +2021,9 @@ static int snd_cs4231_ebus_create(struct snd_card *card,
}
snd_cs4231_init(chip);
- if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
- chip, &snd_cs4231_ebus_dev_ops)) < 0) {
+ err = snd_device_new(card, SNDRV_DEV_LOWLEVEL,
+ chip, &snd_cs4231_ebus_dev_ops);
+ if (err < 0) {
snd_cs4231_ebus_free(chip);
return err;
}
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index b055f5839578..6b84f66e4af4 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2226,11 +2226,12 @@ static int snd_dbri_pcm(struct snd_card *card)
struct snd_pcm *pcm;
int err;
- if ((err = snd_pcm_new(card,
- /* ID */ "sun_dbri",
- /* device */ 0,
- /* playback count */ 1,
- /* capture count */ 1, &pcm)) < 0)
+ err = snd_pcm_new(card,
+ /* ID */ "sun_dbri",
+ /* device */ 0,
+ /* playback count */ 1,
+ /* capture count */ 1, &pcm);
+ if (err < 0)
return err;
snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_dbri_ops);