projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'nomadik-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[cascardo/linux.git]
/
sound
/
firewire
/
bebob
/
bebob_terratec.c
diff --git
a/sound/firewire/bebob/bebob_terratec.c
b/sound/firewire/bebob/bebob_terratec.c
index
0e4c0bf
..
9940611
100644
(file)
--- a/
sound/firewire/bebob/bebob_terratec.c
+++ b/
sound/firewire/bebob/bebob_terratec.c
@@
-24,7
+24,12
@@
phase88_rack_clk_src_get(struct snd_bebob *bebob, unsigned int *id)
if (err < 0)
goto end;
- *id = (enable_ext & 0x01) | ((enable_word & 0x01) << 1);
+ if (enable_ext == 0)
+ *id = 0;
+ else if (enable_word == 0)
+ *id = 1;
+ else
+ *id = 2;
end:
return err;
}