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
/
bebob
/
bebob_yamaha.c
diff --git
a/kernel/sound/firewire/bebob/bebob_yamaha.c
b/kernel/sound/firewire/bebob/bebob_yamaha.c
index
ef1fe38
..
90d4404
100644
(file)
--- a/
kernel/sound/firewire/bebob/bebob_yamaha.c
+++ b/
kernel/sound/firewire/bebob/bebob_yamaha.c
@@
-28,22
+28,34
@@
* reccomend users to close ffado-mixer at 192.0kHz if mixer is needless.
*/
* reccomend users to close ffado-mixer at 192.0kHz if mixer is needless.
*/
-static const char *const clk_src_labels[] = {SND_BEBOB_CLOCK_INTERNAL, "SPDIF"};
+static enum snd_bebob_clock_type clk_src_types[] = {
+ SND_BEBOB_CLOCK_TYPE_INTERNAL,
+ SND_BEBOB_CLOCK_TYPE_EXTERNAL, /* S/PDIF */
+};
static int
clk_src_get(struct snd_bebob *bebob, unsigned int *id)
{
static int
clk_src_get(struct snd_bebob *bebob, unsigned int *id)
{
- return avc_audio_get_selector(bebob->unit, 0, 4, id);
+ int err;
+
+ err = avc_audio_get_selector(bebob->unit, 0, 4, id);
+ if (err < 0)
+ return err;
+
+ if (*id >= ARRAY_SIZE(clk_src_types))
+ return -EIO;
+
+ return 0;
}
}
-static struct snd_bebob_clock_spec clock_spec = {
- .num = ARRAY_SIZE(clk_src_
label
s),
- .
labels = clk_src_label
s,
+static
const
struct snd_bebob_clock_spec clock_spec = {
+ .num = ARRAY_SIZE(clk_src_
type
s),
+ .
types = clk_src_type
s,
.get = &clk_src_get,
};
.get = &clk_src_get,
};
-static struct snd_bebob_rate_spec rate_spec = {
+static
const
struct snd_bebob_rate_spec rate_spec = {
.get = &snd_bebob_stream_get_rate,
.set = &snd_bebob_stream_set_rate,
};
.get = &snd_bebob_stream_get_rate,
.set = &snd_bebob_stream_set_rate,
};
-struct snd_bebob_spec yamaha_go_spec = {
+
const
struct snd_bebob_spec yamaha_go_spec = {
.clock = &clock_spec,
.rate = &rate_spec,
.meter = NULL
.clock = &clock_spec,
.rate = &rate_spec,
.meter = NULL