aboutsummaryrefslogtreecommitdiffstats
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2015-10-18 09:39:53 -0400
committerTakashi Iwai <tiwai@suse.de>2015-10-19 05:57:03 -0400
commitbd04809bbe4c1f749650bb990c969112a5e10aef (patch)
tree27cf07a91b461fe63ce8d235122009f09b900880 /sound/firewire
parentfef586d58960bc867c1fa8126ee5d7364a5a89ac (diff)
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: 9edf723fd858('ALSA: firewire-digi00x: add skeleton for Digi 002/003 family') Fixes: c0949b278515('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>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/digi00x/digi00x.c3
-rw-r--r--sound/firewire/tascam/tascam.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/sound/firewire/digi00x/digi00x.c b/sound/firewire/digi00x/digi00x.c
index bbe3be7fea9b..1f33b7a1fca4 100644
--- a/sound/firewire/digi00x/digi00x.c
+++ b/sound/firewire/digi00x/digi00x.c
@@ -34,8 +34,7 @@ static int name_card(struct snd_dg00x *dg00x)
34 strcpy(dg00x->card->mixername, model); 34 strcpy(dg00x->card->mixername, model);
35 snprintf(dg00x->card->longname, sizeof(dg00x->card->longname), 35 snprintf(dg00x->card->longname, sizeof(dg00x->card->longname),
36 "Digidesign %s, GUID %08x%08x at %s, S%d", model, 36 "Digidesign %s, GUID %08x%08x at %s, S%d", model,
37 cpu_to_be32(fw_dev->config_rom[3]), 37 fw_dev->config_rom[3], fw_dev->config_rom[4],
38 cpu_to_be32(fw_dev->config_rom[4]),
39 dev_name(&dg00x->unit->device), 100 << fw_dev->max_speed); 38 dev_name(&dg00x->unit->device), 100 << fw_dev->max_speed);
40 39
41 return 0; 40 return 0;
diff --git a/sound/firewire/tascam/tascam.c b/sound/firewire/tascam/tascam.c
index c6747a45795b..c2f42cd3f3b8 100644
--- a/sound/firewire/tascam/tascam.c
+++ b/sound/firewire/tascam/tascam.c
@@ -73,8 +73,7 @@ static int identify_model(struct snd_tscm *tscm)
73 strcpy(tscm->card->mixername, model); 73 strcpy(tscm->card->mixername, model);
74 snprintf(tscm->card->longname, sizeof(tscm->card->longname), 74 snprintf(tscm->card->longname, sizeof(tscm->card->longname),
75 "TASCAM %s, GUID %08x%08x at %s, S%d", model, 75 "TASCAM %s, GUID %08x%08x at %s, S%d", model,
76 cpu_to_be32(fw_dev->config_rom[3]), 76 fw_dev->config_rom[3], fw_dev->config_rom[4],
77 cpu_to_be32(fw_dev->config_rom[4]),
78 dev_name(&tscm->unit->device), 100 << fw_dev->max_speed); 77 dev_name(&tscm->unit->device), 100 << fw_dev->max_speed);
79 78
80 return 0; 79 return 0;