Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: firewire: Use common error handling code in snd_motu_stream_start_duplex()

Browse Source 
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>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Markus Elfring 2017-09-06 13:30:14 +02:00 committed by Takashi Iwai
parent 2a0d85d9ad
commit f16e666b9b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/firewire/motu/motu-stream.c
View File

@ -253,24 +253,21 @@ int snd_motu_stream_start_duplex(struct snd_motu *motu, unsigned int rate)
if (err < 0) { if (err < 0) {
dev_err(&motu->unit->device, dev_err(&motu->unit->device,
"fail to start isochronous comm: %d\n", err); "fail to start isochronous comm: %d\n", err);
stop_both_streams(motu); goto stop_streams;
return err;
} }
err = start_isoc_ctx(motu, &motu->rx_stream); err = start_isoc_ctx(motu, &motu->rx_stream);
if (err < 0) { if (err < 0) {
dev_err(&motu->unit->device, dev_err(&motu->unit->device,
"fail to start IT context: %d\n", err); "fail to start IT context: %d\n", err);
stop_both_streams(motu); goto stop_streams;
return err;
} }
err = protocol->switch_fetching_mode(motu, true); err = protocol->switch_fetching_mode(motu, true);
if (err < 0) { if (err < 0) {
dev_err(&motu->unit->device, dev_err(&motu->unit->device,
"fail to enable frame fetching: %d\n", err); "fail to enable frame fetching: %d\n", err);
stop_both_streams(motu); goto stop_streams;
return err;
} }
} }
@ -281,12 +278,15 @@ int snd_motu_stream_start_duplex(struct snd_motu *motu, unsigned int rate)
dev_err(&motu->unit->device, dev_err(&motu->unit->device,
"fail to start IR context: %d", err); "fail to start IR context: %d", err);
amdtp_stream_stop(&motu->rx_stream); amdtp_stream_stop(&motu->rx_stream);
stop_both_streams(motu); goto stop_streams;
return err;
} }
} }
return 0; return 0;
stop_streams:
stop_both_streams(motu);
return err;
} }
void snd_motu_stream_stop_duplex(struct snd_motu *motu) void snd_motu_stream_stop_duplex(struct snd_motu *motu)