diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2015-09-19 11:21:49 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-09-29 12:35:45 +0200 |
| commit | 547e631ce3886175a33b5ccf67729bdd18e9b7e0 (patch) | |
| tree | 8c48fda0c7a8c5442d00a100901bd1747e349155 /sound/firewire/oxfw/oxfw-stream.c | |
| parent | 10b2b6dc1a6bb287411045c788f76d53f96c11bc (diff) | |
| download | op-kernel-dev-547e631ce3886175a33b5ccf67729bdd18e9b7e0.zip op-kernel-dev-547e631ce3886175a33b5ccf67729bdd18e9b7e0.tar.gz | |
ALSA: firewire-lib: return error code when amdtp_stream_set_parameters() detects error
Currently, amdtp_stream_set_parameters() returns no error even if wrong
arguments are given. This is not good for streaming layer because drivers
can continue processing ignoring capability of streaming layer.
This commit changes this function to return error code.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/oxfw/oxfw-stream.c')
| -rw-r--r-- | sound/firewire/oxfw/oxfw-stream.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/firewire/oxfw/oxfw-stream.c b/sound/firewire/oxfw/oxfw-stream.c index 77ad5b9..d119468 100644 --- a/sound/firewire/oxfw/oxfw-stream.c +++ b/sound/firewire/oxfw/oxfw-stream.c @@ -155,7 +155,10 @@ static int start_stream(struct snd_oxfw *oxfw, struct amdtp_stream *stream, err = -EINVAL; goto end; } - amdtp_stream_set_parameters(stream, rate, pcm_channels, midi_ports); + err = amdtp_stream_set_parameters(stream, rate, + pcm_channels, midi_ports); + if (err < 0) + goto end; err = cmp_connection_establish(conn, amdtp_stream_get_max_payload(stream)); |
