-----BEGIN PGP SIGNED MESSAGE-----Hash: SHA1
From: Raphaël Doursenaud <rdoursenaud@xxxxxxx>
Correct firmware path to reflect actual location.This was causing hotplug to fail.Inspired by the emu10k1 module.
Signed-off-by: Raphael Doursenaud <rdoursenaud@xxxxxxx>- --- sound/pci/rme9652/hdsp.c | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.cindex 314e735..48f5434 100644- --- a/sound/pci/rme9652/hdsp.c+++ b/sound/pci/rme9652/hdsp.c@@ -59,11 +59,17 @@ MODULE_LICENSE("GPL"); MODULE_SUPPORTED_DEVICE("{{RME Hammerfall-DSP}," "{RME HDSP-9652}," "{RME HDSP-9632}}");++#define MULTIFACE_FILENAME "hdsploader/multiface_firmware.bin"+#define MULTIFACE_REV11_FILENAME "hdsploader/multiface_firmware_rev11.bin"+#define DIGIFACE_FILENAME "hdsploader/digiface_firmware.bin"+#define DIGIFACE_REV11_FILENAME "hdsploader/digiface_firmware_rev11.bin"+ #ifdef HDSP_FW_LOADER- -MODULE_FIRMWARE("multiface_firmware.bin");- -MODULE_FIRMWARE("multiface_firmware_rev11.bin");- -MODULE_FIRMWARE("digiface_firmware.bin");- -MODULE_FIRMWARE("digiface_firmware_rev11.bin");+MODULE_FIRMWARE(MULTIFACE_FILENAME);+MODULE_FIRMWARE(MULTIFACE_REV11_FILENAME);+MODULE_FIRMWARE(DIGIFACE_FILENAME);+MODULE_FIRMWARE(DIGIFACE_REV11_FILENAME); #endif
#define HDSP_MAX_CHANNELS 26@@ -4928,15 +4934,15 @@ static int hdsp_request_fw_loader(struct hdsp *hdsp) switch (hdsp->io_type) { case Multiface: if (hdsp->firmware_rev == 0xa)- - fwfile = "multiface_firmware.bin";+ fwfile = MULTIFACE_FILENAME; else- - fwfile = "multiface_firmware_rev11.bin";+ fwfile = MULTIFACE_REV11_FILENAME; break; case Digiface: if (hdsp->firmware_rev == 0xa)- - fwfile = "digiface_firmware.bin";+ fwfile = DIGIFACE_FILENAME; else- - fwfile = "digiface_firmware_rev11.bin";+ fwfile = DIGIFACE_REV11_FILENAME; break; default: snd_printk(KERN_ERR "Hammerfall-DSP: invalid io_type %d\n",hdsp->io_type);- --Raphaël Doursenaud
-----BEGIN PGP SIGNATURE-----Version: GnuPG v1.4.9 (GNU/Linux)Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkoWurIACgkQaZKmNAdXaVVYYACdEyheX1+7sUbWURScDRFV66XVs4gAniZHnEfwRG012ZQmaDAhDhNXQf9Z=Ex8j-----END PGP SIGNATURE-----_______________________________________________Alsa-devel mailing listAlsa-devel@xxxxxxxxxxxxxxxxxxxx://mailman.alsa-project.org/mailman/listinfo/alsa-devel
