At Thu, 23 May 2013 13:38:29 +0200, Torsten Schenk wrote:
Check only the uppermost 16 bits instead of the whole 32 bits of the version information. Do this because all firmware version tested with this version information worked correctly and the strict check causes problems for several users.
Signed-off-by: Torsten Schenk torsten.schenk@zoho.com
Thanks, applied.
Takashi
diff -Nur a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c --- a/sound/usb/6fire/firmware.c 2013-05-23 13:32:39.432545897 +0200 +++ b/sound/usb/6fire/firmware.c 2013-05-23 13:33:21.998193012 +0200 @@ -42,8 +42,8 @@ 0x94, 0x01, 0x5c, 0x02 /* alt 3: 404 EP2 and 604 EP6 (25 fpp) */ };
-static const u8 known_fw_versions[][4] = {
- { 0x03, 0x01, 0x0b, 0x00 }
+static const u8 known_fw_versions[][2] = {
- { 0x03, 0x01 }
};
struct ihex_record { @@ -343,7 +343,7 @@ int i;
for (i = 0; i < ARRAY_SIZE(known_fw_versions); i++)
if (!memcmp(version, known_fw_versions + i, 4))
if (!memcmp(version, known_fw_versions + i, 2)) return 0;snd_printk(KERN_ERR PREFIX "invalid fimware version in device: %*ph. "