From: Takashi Iwai Subject: Re: [PATCH 1/1] hdsp: right firmware path Date: Fri, 22 May 2009 19:28:34 +0200 Message-ID: References: <4A16BAB5.3040604@free.fr> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id CCBA82440C for ; Fri, 22 May 2009 19:28:34 +0200 (CEST) In-Reply-To: <4A16BAB5.3040604@free.fr> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: =?ISO-8859-1?Q?Rapha=EBl?= Doursenaud Cc: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org At Fri, 22 May 2009 16:46:13 +0200, Rapha=EBl Doursenaud wrote: > = > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > = > From: Rapha=EBl Doursenaud > = > Correct firmware path to reflect actual location. > This was causing hotplug to fail. The firmware files of hdsp are actually located without "hdsploader/" path but directly in /lib/firmware as default. Is it different on your systems? thanks, Takashi > Inspired by the emu10k1 module. > = > Signed-off-by: Raphael Doursenaud > - --- > 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.c > index 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.bi= n" > +#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 *hd= sp) > switch (hdsp->io_type) { > case Multiface: > if (hdsp->firmware_rev =3D=3D 0xa) > - - fwfile =3D "multiface_firmware.bin"; > + fwfile =3D MULTIFACE_FILENAME; > else > - - fwfile =3D "multiface_firmware_rev11.bin"; > + fwfile =3D MULTIFACE_REV11_FILENAME; > break; > case Digiface: > if (hdsp->firmware_rev =3D=3D 0xa) > - - fwfile =3D "digiface_firmware.bin"; > + fwfile =3D DIGIFACE_FILENAME; > else > - - fwfile =3D "digiface_firmware_rev11.bin"; > + fwfile =3D DIGIFACE_REV11_FILENAME; > break; > default: > snd_printk(KERN_ERR "Hammerfall-DSP: invalid io_type %d\n", > hdsp->io_type); > - -- > Rapha=EBl Doursenaud > = > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.4.9 (GNU/Linux) > Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org > = > iEYEARECAAYFAkoWurIACgkQaZKmNAdXaVVYYACdEyheX1+7sUbWURScDRFV66XV > s4gAniZHnEfwRG012ZQmaDAhDhNXQf9Z > =3DEx8j > -----END PGP SIGNATURE----- > =