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

Commit bd04809b authored Oct 18, 2015 by Takashi Sakamoto Committed by Takashi Iwai Oct 19, 2015

ALSA: firewire-digi00x/firewire-tascam: remove wrong conversion for Config ROM



The contents of Config ROM in firewire device structure are already
aligned to CPU-endianness. Thus, no need to convert it again.

This commit removes needless conversions

Fixes: 9edf723f('ALSA: firewire-digi00x: add skeleton for Digi 002/003 family')
Fixes: c0949b27('ALSA: firewire-tascam: add skeleton for TASCAM FireWire series')
Reported-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent fef586d5

sound/firewire/digi00x/digi00x.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -34,8 +34,7 @@ static int name_card(struct snd_dg00x *dg00x)
	strcpy(dg00x->card->mixername, model);		strcpy(dg00x->card->mixername, model);
	snprintf(dg00x->card->longname, sizeof(dg00x->card->longname),		snprintf(dg00x->card->longname, sizeof(dg00x->card->longname),
	"Digidesign %s, GUID %08x%08x at %s, S%d", model,		"Digidesign %s, GUID %08x%08x at %s, S%d", model,
	cpu_to_be32(fw_dev->config_rom[3]),		fw_dev->config_rom[3], fw_dev->config_rom[4],
	cpu_to_be32(fw_dev->config_rom[4]),
	dev_name(&dg00x->unit->device), 100 << fw_dev->max_speed);		dev_name(&dg00x->unit->device), 100 << fw_dev->max_speed);

	return 0;		return 0;

sound/firewire/tascam/tascam.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -73,8 +73,7 @@ static int identify_model(struct snd_tscm *tscm)
	strcpy(tscm->card->mixername, model);		strcpy(tscm->card->mixername, model);
	snprintf(tscm->card->longname, sizeof(tscm->card->longname),		snprintf(tscm->card->longname, sizeof(tscm->card->longname),
	"TASCAM %s, GUID %08x%08x at %s, S%d", model,		"TASCAM %s, GUID %08x%08x at %s, S%d", model,
	cpu_to_be32(fw_dev->config_rom[3]),		fw_dev->config_rom[3], fw_dev->config_rom[4],
	cpu_to_be32(fw_dev->config_rom[4]),
	dev_name(&tscm->unit->device), 100 << fw_dev->max_speed);		dev_name(&tscm->unit->device), 100 << fw_dev->max_speed);

	return 0;		return 0;