Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b33504b authored by Takashi Sakamoto's avatar Takashi Sakamoto Committed by Takashi Iwai
Browse files

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



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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Fixes: 5992e300 ("ALSA: firewire-motu: add support for MOTU 828mk3 (FireWire/Hybrid) as a model with protocol version 3")
Signed-off-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fdb2b2ee

sound/firewire/motu/motu-protocol-v3.c

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#define  V3_CLOCK_RATE_MASK		0x0000ff00

#define  V3_CLOCK_RATE_SHIFT		8

#define  V3_CLOCK_SOURCE_MASK		0x000000ff

#define  V3_CLOCK_SOURCE_SHIFT		8



#define V3_OPT_IFACE_MODE_OFFSET	0x0c94

#define  V3_ENABLE_OPT_IN_IFACE_A	0x00000001
@@ -101,7 +100,7 @@ static int v3_get_clock_source(struct snd_motu *motu, 
		return err;

	data = be32_to_cpu(reg);



	val = (data & V3_CLOCK_SOURCE_MASK) >> V3_CLOCK_SOURCE_SHIFT;

	val = data & V3_CLOCK_SOURCE_MASK;

	if (val == 0x00) {

		*src = SND_MOTU_CLOCK_SOURCE_INTERNAL;

	} else if (val == 0x01) {