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

ALSA: firewire-motu: remove invalid bitshift for register value

Browse Source 
In protocol version 3, drivers can read current sampling clock status from
register 0x'ffff'f000'0b14. 8 bits of LSB of this register represents type
of signal as source of clock.

Current driver code includes invalid bitshift to handle the parameter. This
commit fixes the bug.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: 5992e30034 ("ALSA: firewire-motu: add support for MOTU 828mk3 (FireWire/Hybrid) as a model with protocol version 3")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2017-04-03 21:13:50 +09:00 committed by Takashi Iwai
parent fdb2b2eee6
commit 5b33504bad
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/firewire/motu/motu-protocol-v3.c
View File

@ -14,7 +14,6 @@
#define V3_CLOCK_RATE_MASK 0x0000ff00 #define V3_CLOCK_RATE_MASK 0x0000ff00
#define V3_CLOCK_RATE_SHIFT 8 #define V3_CLOCK_RATE_SHIFT 8
#define V3_CLOCK_SOURCE_MASK 0x000000ff #define V3_CLOCK_SOURCE_MASK 0x000000ff
#define V3_CLOCK_SOURCE_SHIFT 8
#define V3_OPT_IFACE_MODE_OFFSET 0x0c94 #define V3_OPT_IFACE_MODE_OFFSET 0x0c94
#define V3_ENABLE_OPT_IN_IFACE_A 0x00000001 #define V3_ENABLE_OPT_IN_IFACE_A 0x00000001
@ -101,7 +100,7 @@ static int v3_get_clock_source(struct snd_motu *motu,
return err; return err;
data = be32_to_cpu(reg); data = be32_to_cpu(reg);
val = (data & V3_CLOCK_SOURCE_MASK) >> V3_CLOCK_SOURCE_SHIFT; val = data & V3_CLOCK_SOURCE_MASK;
if (val == 0x00) { if (val == 0x00) {
*src = SND_MOTU_CLOCK_SOURCE_INTERNAL; *src = SND_MOTU_CLOCK_SOURCE_INTERNAL;
} else if (val == 0x01) { } else if (val == 0x01) {