* [PATCH] Fix regression in emu1010 firmware loading
@ 2013-02-21 21:06 Mihail Zenkov
2013-02-22 6:19 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Mihail Zenkov @ 2013-02-21 21:06 UTC (permalink / raw)
To: alsa-devel
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
This patch fix regression in emu1010 firmware loading after
http://git.alsa-project.org/?p=alsa-kprivate.git;a=commitdiff;h=b209c4dfcd960ab176d4746ab7dc442a3edb4575
I just revert small part of this commit. Tested on emu1212m pci.
[-- Attachment #2: kernel-fix_emu_firmware_load.patch --]
[-- Type: application/octet-stream, Size: 461 bytes --]
--- linux-3.8/sound/pci/emu10k1/emu10k1_main.c
+++ linux-3.8-1/sound/pci/emu10k1/emu10k1_main.c
@@ -860,6 +860,11 @@
}
snd_printk(KERN_INFO "emu1010: firmware file = %s, size = 0x%zx\n",
filename, emu->firmware->size);
+ err = snd_emu1010_load_firmware(emu);
+ if (err != 0) {
+ snd_printk(KERN_INFO "emu1010: Loading Firmware file %s failed\n", filename);
+ return err;
+ }
}
/* ID, should read & 0x7f = 0x55 when FPGA programmed. */
[-- Attachment #3: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix regression in emu1010 firmware loading
2013-02-21 21:06 [PATCH] Fix regression in emu1010 firmware loading Mihail Zenkov
@ 2013-02-22 6:19 ` Takashi Iwai
2013-02-22 11:25 ` Mihail Zenkov
0 siblings, 1 reply; 4+ messages in thread
From: Takashi Iwai @ 2013-02-22 6:19 UTC (permalink / raw)
To: Mihail Zenkov; +Cc: alsa-devel
At Thu, 21 Feb 2013 21:06:14 +0000,
Mihail Zenkov wrote:
>
> This patch fix regression in emu1010 firmware loading after
> http://git.alsa-project.org/?p=alsa-kprivate.git;a=commitdiff;h=b209c4dfcd960ab176d4746ab7dc442a3edb4575
>
> I just revert small part of this commit. Tested on emu1212m pci.
Thanks. Could you give your sign-off? It's mandatory for merging to
the upstream. See Documentation/SubmittingPatches for details.
Takashi
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix regression in emu1010 firmware loading
2013-02-22 6:19 ` Takashi Iwai
@ 2013-02-22 11:25 ` Mihail Zenkov
2013-02-22 15:42 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Mihail Zenkov @ 2013-02-22 11:25 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel
This patch fix regression in emu1010 firmware loading after
http://git.alsa-project.org/?p=alsa-kprivate.git;a=commitdiff;h=b209c4dfcd960ab176d4746ab7dc442a3edb4575
I just revert small part of this commit. Tested on emu1212m pci.
Signed-off-by: Mihail Zenkov <mihail.zenkov@gmail.com>
--- linux-3.8/sound/pci/emu10k1/emu10k1_main.c
+++ linux-3.8-1/sound/pci/emu10k1/emu10k1_main.c
@@ -860,6 +860,11 @@
}
snd_printk(KERN_INFO "emu1010: firmware file = %s, size = 0x%zx\n",
filename, emu->firmware->size);
+ err = snd_emu1010_load_firmware(emu);
+ if (err != 0) {
+ snd_printk(KERN_INFO "emu1010: Loading Firmware file %s failed\n",
filename);
+ return err;
+ }
}
/* ID, should read & 0x7f = 0x55 when FPGA programmed. */
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Fix regression in emu1010 firmware loading
2013-02-22 11:25 ` Mihail Zenkov
@ 2013-02-22 15:42 ` Takashi Iwai
0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2013-02-22 15:42 UTC (permalink / raw)
To: Mihail Zenkov; +Cc: alsa-devel
At Fri, 22 Feb 2013 11:25:27 +0000,
Mihail Zenkov wrote:
>
> This patch fix regression in emu1010 firmware loading after
> http://git.alsa-project.org/?p=alsa-kprivate.git;a=commitdiff;h=b209c4dfcd960ab176d4746ab7dc442a3edb4575
>
> I just revert small part of this commit. Tested on emu1212m pci.
>
> Signed-off-by: Mihail Zenkov <mihail.zenkov@gmail.com>
Thanks, applied.
Takashi
> --- linux-3.8/sound/pci/emu10k1/emu10k1_main.c
> +++ linux-3.8-1/sound/pci/emu10k1/emu10k1_main.c
> @@ -860,6 +860,11 @@
> }
> snd_printk(KERN_INFO "emu1010: firmware file = %s, size = 0x%zx\n",
> filename, emu->firmware->size);
> + err = snd_emu1010_load_firmware(emu);
> + if (err != 0) {
> + snd_printk(KERN_INFO "emu1010: Loading Firmware file %s failed\n",
> filename);
> + return err;
> + }
> }
>
> /* ID, should read & 0x7f = 0x55 when FPGA programmed. */
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-02-22 15:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-21 21:06 [PATCH] Fix regression in emu1010 firmware loading Mihail Zenkov
2013-02-22 6:19 ` Takashi Iwai
2013-02-22 11:25 ` Mihail Zenkov
2013-02-22 15:42 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).