* [PATCH] ALSA: USB-MIDI: Use common error handling code in __snd_usbmidi_create()
@ 2017-08-23 10:25 SF Markus Elfring
2017-08-23 10:49 ` [alsa-devel] " Clemens Ladisch
2017-08-23 10:54 ` Takashi Iwai
0 siblings, 2 replies; 3+ messages in thread
From: SF Markus Elfring @ 2017-08-23 10:25 UTC (permalink / raw)
To: alsa-devel, Clemens Ladisch, Jaroslav Kysela, Takashi Iwai
Cc: LKML, kernel-janitors
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 23 Aug 2017 12:20:07 +0200
Add 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.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
sound/usb/midi.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index a35f41467237..bd9d02268724 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -2435,10 +2435,8 @@ int __snd_usbmidi_create(struct snd_card *card,
err = -ENXIO;
break;
}
- if (err < 0) {
- kfree(umidi);
- return err;
- }
+ if (err < 0)
+ goto free_midi;
/* create rawmidi device */
out_ports = 0;
@@ -2448,23 +2446,25 @@ int __snd_usbmidi_create(struct snd_card *card,
in_ports += hweight16(endpoints[i].in_cables);
}
err = snd_usbmidi_create_rawmidi(umidi, out_ports, in_ports);
- if (err < 0) {
- kfree(umidi);
- return err;
- }
+ if (err < 0)
+ goto free_midi;
/* create endpoint/port structures */
if (quirk && quirk->type == QUIRK_MIDI_MIDIMAN)
err = snd_usbmidi_create_endpoints_midiman(umidi, &endpoints[0]);
else
err = snd_usbmidi_create_endpoints(umidi, endpoints);
- if (err < 0) {
- return err;
- }
+ if (err < 0)
+ goto exit;
usb_autopm_get_interface_no_resume(umidi->iface);
list_add_tail(&umidi->list, midi_list);
return 0;
+
+free_midi:
+ kfree(umidi);
+exit:
+ return err;
}
EXPORT_SYMBOL(__snd_usbmidi_create);
--
2.14.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [alsa-devel] [PATCH] ALSA: USB-MIDI: Use common error handling code in __snd_usbmidi_create()
2017-08-23 10:25 [PATCH] ALSA: USB-MIDI: Use common error handling code in __snd_usbmidi_create() SF Markus Elfring
@ 2017-08-23 10:49 ` Clemens Ladisch
2017-08-23 10:54 ` Takashi Iwai
1 sibling, 0 replies; 3+ messages in thread
From: Clemens Ladisch @ 2017-08-23 10:49 UTC (permalink / raw)
To: Takashi Iwai
Cc: SF Markus Elfring, alsa-devel, Jaroslav Kysela, kernel-janitors, LKML
SF Markus Elfring wrote:
> Add 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.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
> ---
> sound/usb/midi.c | 22 +++++++++++-----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/sound/usb/midi.c b/sound/usb/midi.c
> index a35f41467237..bd9d02268724 100644
> --- a/sound/usb/midi.c
> +++ b/sound/usb/midi.c
> @@ -2435,10 +2435,8 @@ int __snd_usbmidi_create(struct snd_card *card,
> err = -ENXIO;
> break;
> }
> - if (err < 0) {
> - kfree(umidi);
> - return err;
> - }
> + if (err < 0)
> + goto free_midi;
>
> /* create rawmidi device */
> out_ports = 0;
> @@ -2448,23 +2446,25 @@ int __snd_usbmidi_create(struct snd_card *card,
> in_ports += hweight16(endpoints[i].in_cables);
> }
> err = snd_usbmidi_create_rawmidi(umidi, out_ports, in_ports);
> - if (err < 0) {
> - kfree(umidi);
> - return err;
> - }
> + if (err < 0)
> + goto free_midi;
>
> /* create endpoint/port structures */
> if (quirk && quirk->type == QUIRK_MIDI_MIDIMAN)
> err = snd_usbmidi_create_endpoints_midiman(umidi, &endpoints[0]);
> else
> err = snd_usbmidi_create_endpoints(umidi, endpoints);
> - if (err < 0) {
> - return err;
> - }
> + if (err < 0)
> + goto exit;
>
> usb_autopm_get_interface_no_resume(umidi->iface);
>
> list_add_tail(&umidi->list, midi_list);
> return 0;
> +
> +free_midi:
> + kfree(umidi);
> +exit:
> + return err;
> }
> EXPORT_SYMBOL(__snd_usbmidi_create);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ALSA: USB-MIDI: Use common error handling code in __snd_usbmidi_create()
2017-08-23 10:25 [PATCH] ALSA: USB-MIDI: Use common error handling code in __snd_usbmidi_create() SF Markus Elfring
2017-08-23 10:49 ` [alsa-devel] " Clemens Ladisch
@ 2017-08-23 10:54 ` Takashi Iwai
1 sibling, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2017-08-23 10:54 UTC (permalink / raw)
To: SF Markus Elfring
Cc: alsa-devel, Clemens Ladisch, Jaroslav Kysela, kernel-janitors, LKML
On Wed, 23 Aug 2017 12:25:50 +0200,
SF Markus Elfring wrote:
>
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 23 Aug 2017 12:20:07 +0200
>
> Add 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.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Applied, thanks.
Takashi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-08-23 10:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-23 10:25 [PATCH] ALSA: USB-MIDI: Use common error handling code in __snd_usbmidi_create() SF Markus Elfring
2017-08-23 10:49 ` [alsa-devel] " Clemens Ladisch
2017-08-23 10:54 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).