[PATCH v1] ALSA: fm801: Initialize chip after IRQ handler is registered

[PATCH v1] ALSA: fm801: Initialize chip after IRQ handler is registered

[Andy Shevchenko]

The commit b56fa687e02b ("ALSA: fm801: detect FM-only card earlier")
rearranged initialization calls, i.e. it makes snd_fm801_chip_init() to
be called before we register interrupt handler and set PCI bus
mastering.

Somehow it prevents FM801-AU to work properly. Thus, partially revert
initialization order changed by commit mentioned above.

Fixes: b56fa687e02b ("ALSA: fm801: detect FM-only card earlier")
Reported-by: Émeric MASCHINO <emeric.maschino@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 sound/pci/fm801.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 2e402ece4c86..8e6b04b39dcc 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1235,8 +1235,6 @@ static int snd_fm801_create(struct snd_card *card,
 		}
 	}
 
-	snd_fm801_chip_init(chip);
-
 	if ((chip->tea575x_tuner & TUNER_ONLY) == 0) {
 		if (devm_request_irq(&pci->dev, pci->irq, snd_fm801_interrupt,
 				IRQF_SHARED, KBUILD_MODNAME, chip)) {
@@ -1248,6 +1246,8 @@ static int snd_fm801_create(struct snd_card *card,
 		pci_set_master(pci);
 	}
 
+	snd_fm801_chip_init(chip);
+
 	if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
 		snd_fm801_free(chip);
 		return err;
-- 
2.11.0

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH v1] ALSA: fm801: Initialize chip after IRQ handler is registered

[Takashi Iwai]

On Sun, 16 Jul 2017 20:40:03 +0200,
Andy Shevchenko wrote:
> 
> The commit b56fa687e02b ("ALSA: fm801: detect FM-only card earlier")
> rearranged initialization calls, i.e. it makes snd_fm801_chip_init() to
> be called before we register interrupt handler and set PCI bus
> mastering.
> 
> Somehow it prevents FM801-AU to work properly. Thus, partially revert
> initialization order changed by commit mentioned above.
> 
> Fixes: b56fa687e02b ("ALSA: fm801: detect FM-only card earlier")
> Reported-by: Émeric MASCHINO <emeric.maschino@gmail.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Applied now with Cc to stable.  Thanks.


Takashi
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH v1] ALSA: fm801: Initialize chip after IRQ handler is registered

[Takashi Iwai]

On Sun, 16 Jul 2017 20:46:30 +0200,
Takashi Iwai wrote:
> 
> On Sun, 16 Jul 2017 20:40:03 +0200,
> Andy Shevchenko wrote:
> > 
> > The commit b56fa687e02b ("ALSA: fm801: detect FM-only card earlier")
> > rearranged initialization calls, i.e. it makes snd_fm801_chip_init() to
> > be called before we register interrupt handler and set PCI bus
> > mastering.
> > 
> > Somehow it prevents FM801-AU to work properly. Thus, partially revert
> > initialization order changed by commit mentioned above.
> > 
> > Fixes: b56fa687e02b ("ALSA: fm801: detect FM-only card earlier")
> > Reported-by: Émeric MASCHINO <emeric.maschino@gmail.com>
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> 
> Applied now with Cc to stable.  Thanks.

Ah, I see you want to get confirmation from Emeric.
OK I take it back and wait for the tested-by.


Takashi
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH v1] ALSA: fm801: Initialize chip after IRQ handler is registered

[Émeric MASCHINO]

The commit b56fa687e02b ("ALSA: fm801: detect FM-only card earlier")
rearranged initialization calls, i.e. it makes snd_fm801_chip_init() to
be called before we register interrupt handler and set PCI bus
mastering.

Somehow it prevents FM801-AU to work properly. Thus, partially revert
initialization order changed by commit mentioned above.

Fixes: b56fa687e02b ("ALSA: fm801: detect FM-only card earlier")
Reported-by: Émeric MASCHINO <emeric.maschino@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Émeric MASCHINO <emeric.maschino@gmail.com>
---
 sound/pci/fm801.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 2e402ece4c86..8e6b04b39dcc 100644
--- a/sound/pci/fm801.c
+++ b/sound/pci/fm801.c
@@ -1235,8 +1235,6 @@ static int snd_fm801_create(struct snd_card *card,
                }
        }

-       snd_fm801_chip_init(chip);
-
        if ((chip->tea575x_tuner & TUNER_ONLY) == 0) {
                if (devm_request_irq(&pci->dev, pci->irq, snd_fm801_interrupt,
                                IRQF_SHARED, KBUILD_MODNAME, chip)) {
@@ -1248,6 +1246,8 @@ static int snd_fm801_create(struct snd_card *card,
                pci_set_master(pci);
        }

+       snd_fm801_chip_init(chip);
+
        if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
                snd_fm801_free(chip);
                return err;
--
2.11.0
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH v1] ALSA: fm801: Initialize chip after IRQ handler is registered

[Émeric MASCHINO]

Just tested-by.

If it does matter for future references, tested with a Genius Sound
Maker Live 5.1 exactly like this one [1] in an hp workstation zx6000
(ia64 architecture).

Thanks,

     Émeric


[1] http://ixbtlabs.com/articles/geniussoundmakerlive51/index.html

2017-07-16 20:50 GMT+02:00 Takashi Iwai <tiwai@suse.de>:
> On Sun, 16 Jul 2017 20:46:30 +0200,
> Takashi Iwai wrote:
>>
>> On Sun, 16 Jul 2017 20:40:03 +0200,
>> Andy Shevchenko wrote:
>> >
>> > The commit b56fa687e02b ("ALSA: fm801: detect FM-only card earlier")
>> > rearranged initialization calls, i.e. it makes snd_fm801_chip_init() to
>> > be called before we register interrupt handler and set PCI bus
>> > mastering.
>> >
>> > Somehow it prevents FM801-AU to work properly. Thus, partially revert
>> > initialization order changed by commit mentioned above.
>> >
>> > Fixes: b56fa687e02b ("ALSA: fm801: detect FM-only card earlier")
>> > Reported-by: Émeric MASCHINO <emeric.maschino@gmail.com>
>> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>>
>> Applied now with Cc to stable.  Thanks.
>
> Ah, I see you want to get confirmation from Emeric.
> OK I take it back and wait for the tested-by.
>
>
> Takashi
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH v1] ALSA: fm801: Initialize chip after IRQ handler is registered

[Takashi Iwai]

On Mon, 17 Jul 2017 21:27:47 +0200,
Émeric MASCHINO wrote:
> 
> Just tested-by.
> 
> If it does matter for future references, tested with a Genius Sound
> Maker Live 5.1 exactly like this one [1] in an hp workstation zx6000
> (ia64 architecture).

Thanks, I applied the patch now.


Takashi
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel