Skip to content

Commit

Permalink
ALSA: riptide - Fix detection / load of firmware files
Browse files Browse the repository at this point in the history
The detection and loading of firmeware on riptide driver has been broken
due to rewrite of some codes, checking the presense wrongly.
This patch fixes the logic again.

Reference: kernel bug 16596
	https://bugzilla.kernel.org/show_bug.cgi?id=16596

Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Aug 16, 2010
1 parent da5cabf commit a5ba6be
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions sound/pci/riptide/riptide.c
Original file line number Diff line number Diff line change
Expand Up @@ -1224,15 +1224,14 @@ static int try_to_load_firmware(struct cmdif *cif, struct snd_riptide *chip)
firmware.firmware.ASIC, firmware.firmware.CODEC,
firmware.firmware.AUXDSP, firmware.firmware.PROG);

if (!chip)
return 1;

for (i = 0; i < FIRMWARE_VERSIONS; i++) {
if (!memcmp(&firmware_versions[i], &firmware, sizeof(firmware)))
break;
}
if (i >= FIRMWARE_VERSIONS)
return 0; /* no match */
return 1; /* OK */

if (!chip)
return 1; /* OK */
}

snd_printdd("Writing Firmware\n");
if (!chip->fw_entry) {
Expand Down

0 comments on commit a5ba6be

Please sign in to comment.