Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
sound
/
firewire
/
fireworks
/
fireworks_stream.c
diff --git
a/kernel/sound/firewire/fireworks/fireworks_stream.c
b/kernel/sound/firewire/fireworks/fireworks_stream.c
index
7e353f1
..
759f6e3
100644
(file)
--- a/
kernel/sound/firewire/fireworks/fireworks_stream.c
+++ b/
kernel/sound/firewire/fireworks/fireworks_stream.c
@@
-31,7
+31,7
@@
init_stream(struct snd_efw *efw, struct amdtp_stream *stream)
if (err < 0)
goto end;
if (err < 0)
goto end;
- err = amdtp_
stream
_init(stream, efw->unit, s_dir, CIP_BLOCKING);
+ err = amdtp_
am824
_init(stream, efw->unit, s_dir, CIP_BLOCKING);
if (err < 0) {
amdtp_stream_destroy(stream);
cmp_connection_destroy(conn);
if (err < 0) {
amdtp_stream_destroy(stream);
cmp_connection_destroy(conn);
@@
-73,8
+73,10
@@
start_stream(struct snd_efw *efw, struct amdtp_stream *stream,
midi_ports = efw->midi_in_ports;
}
midi_ports = efw->midi_in_ports;
}
- amdtp_stream_set_parameters(stream, sampling_rate,
- pcm_channels, midi_ports);
+ err = amdtp_am824_set_parameters(stream, sampling_rate,
+ pcm_channels, midi_ports, false);
+ if (err < 0)
+ goto end;
/* establish connection via CMP */
err = cmp_connection_establish(conn,
/* establish connection via CMP */
err = cmp_connection_establish(conn,