Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1717519
| From | SF Markus Elfring <elfring@users.sourceforge.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v3] ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() |
| Date | 2017-08-22 17:50 +0200 |
| Message-ID | <uhjBf-4nc-1@gated-at.bofh.it> (permalink) |
| References | (6 earlier) <uhi2t-3sd-21@gated-at.bofh.it> <uhivw-3DB-7@gated-at.bofh.it> <uhiFb-3Hr-5@gated-at.bofh.it> <uhiYy-45R-11@gated-at.bofh.it> <uhiYy-45R-9@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 22 Aug 2017 17:33:33 +0200
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.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
v3:
* An approach to make a few checks for a failure predicate a bit safer
was rejected today.
* An extra blank line was added before a label.
v2:
Two statements were moved together with an additional jump label to the end
of this function.
sound/drivers/pcsp/pcsp.c | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c
index 72e2d0012084..0dd3f46eb03e 100644
--- a/sound/drivers/pcsp/pcsp.c
+++ b/sound/drivers/pcsp/pcsp.c
@@ -108,22 +108,17 @@ static int snd_card_pcsp_probe(int devnum, struct device *dev)
return err;
err = snd_pcsp_create(card);
- if (err < 0) {
- snd_card_free(card);
- return err;
- }
+ if (err < 0)
+ goto free_card;
+
if (!nopcm) {
err = snd_pcsp_new_pcm(&pcsp_chip);
- if (err < 0) {
- snd_card_free(card);
- return err;
- }
+ if (err < 0)
+ goto free_card;
}
err = snd_pcsp_new_mixer(&pcsp_chip, nopcm);
- if (err < 0) {
- snd_card_free(card);
- return err;
- }
+ if (err < 0)
+ goto free_card;
strcpy(card->driver, "PC-Speaker");
strcpy(card->shortname, "pcsp");
@@ -131,12 +126,14 @@ static int snd_card_pcsp_probe(int devnum, struct device *dev)
pcsp_chip.port);
err = snd_card_register(card);
- if (err < 0) {
- snd_card_free(card);
- return err;
- }
+ if (err < 0)
+ goto free_card;
return 0;
+
+free_card:
+ snd_card_free(card);
+ return err;
}
static int alsa_card_pcsp_init(struct device *dev)
--
2.14.0
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
Re: [PATCH] ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() Dan Carpenter <dan.carpenter@oracle.com> - 2017-08-22 14:20 +0200
Re: [PATCH] ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() Takashi Iwai <tiwai@suse.de> - 2017-08-22 14:30 +0200
Re: [alsa-devel] ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() Takashi Iwai <tiwai@suse.de> - 2017-08-22 15:00 +0200
Re: [alsa-devel] ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-22 15:20 +0200
Re: [alsa-devel] ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() Takashi Iwai <tiwai@suse.de> - 2017-08-22 16:10 +0200
Re: [alsa-devel] ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-22 16:40 +0200
Re: [alsa-devel] ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() Takashi Iwai <tiwai@suse.de> - 2017-08-22 16:50 +0200
Re: [alsa-devel] ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() Takashi Iwai <tiwai@suse.de> - 2017-08-22 17:10 +0200
[PATCH v3] ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-22 17:50 +0200
Re: [PATCH v3] ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() Takashi Iwai <tiwai@suse.de> - 2017-08-22 18:10 +0200
Re: [alsa-devel] ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-22 17:10 +0200
Re: ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-22 15:00 +0200
[PATCH v2] ALSA: pcsp: Use common error handling code in snd_card_pcsp_probe() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-22 16:10 +0200
csiph-web