ALSA: firewire-tascam: fix an LED bug

PATCH Applied Dan Carpenter 2 participants 2 messages Oct 15, 2015 – Oct 17, 2015

Subsystems (3)

Sound Kernel janitors Firewire audio drivers and IEC 61883-1/6 packet streaming engine

lore

Share & tools

lore

Dan Carpenter

author

2015-10-15 18:16 UTC #0 lore raw

PATCH 1/2 ALSA: firewire-tascam: fix an LED bug

We recently tried to add some new code to support turning the LED on and off but the code in snd_tscm_transaction_reregister() is unreachable.

Fixes e65e2cb99e44 ('ALSA: firewire-tascam: Turn on/off FireWire LED')

Signed-off-by Dan Carpenter <[email protected]>

sound/firewire/tascam/tascam-transaction.c +1 -1

index 1c9a88b..45c3ce3 100644
@@ -249,7 +249,7 @@ int snd_tscm_transaction_reregister(struct snd_tscm *tscm)
 
 	/* Turn on messaging. */
 	reg = cpu_to_be32(0x00000001);
-	return snd_fw_transaction(tscm->unit, TCODE_WRITE_QUADLET_REQUEST,
+	err = snd_fw_transaction(tscm->unit, TCODE_WRITE_QUADLET_REQUEST,
 				  TSCM_ADDR_BASE + TSCM_OFFSET_MIDI_TX_ON,
 				  &reg, sizeof(reg), 0);
 	if (err < 0)

Takashi Iwai

Applied

2015-10-17 10:12 UTC #1 lore raw

Quoted 6 lines · Dan Carpenter

We recently tried to add some new code to support turning the LED on and off but the code in snd_tscm_transaction_reregister() is unreachable.
Fixes e65e2cb99e44 ('ALSA: firewire-tascam: Turn on/off FireWire LED')
Signed-off-by Dan Carpenter <[email protected]>

Applied, thanks.

Takashi

Quoted 15 lines

sound/firewire/tascam/tascam-transaction.c +1 -1

index 1c9a88b..45c3ce3 100644
@@ -249,7 +249,7 @@ int snd_tscm_transaction_reregister(struct snd_tscm *tscm)
 
 	/* Turn on messaging. */
 	reg = cpu_to_be32(0x00000001);
-	return snd_fw_transaction(tscm->unit, TCODE_WRITE_QUADLET_REQUEST,
+	err = snd_fw_transaction(tscm->unit, TCODE_WRITE_QUADLET_REQUEST,
 				  TSCM_ADDR_BASE + TSCM_OFFSET_MIDI_TX_ON,
 				  &reg, sizeof(reg), 0);
 	if (err < 0)