Skip to contentSkip to conversation

ALSA: fm801: Initialize chip after IRQ handler is registered

PATCH In review Andy Shevchenko 3 participants 6 messages Jul 16, 2017 – Jul 18, 2017 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: fm801: Initialize chip after IRQ handler is registered

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")
---
 sound/pci/fm801.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/fm801.c +2 -2
index 2e402ece4c86..8e6b04b39dcc 100644
@@ -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;
Signature · 6 lines
2.11.0

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
#1 lore raw
Quoted 6 lines · 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.

Quoted 6 lines

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")

Applied now with Cc to stable. Thanks.

Takashi
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#2 lore raw
Quoted 9 lines · Takashi Iwai
Quoted 6 lines · 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.

Quoted 8 lines
Quoted 6 lines

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")

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
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#3 lore raw

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 <[email protected]>:

Quoted 18 lines
Quoted 16 lines · Takashi Iwai
Quoted 12 lines · 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")
Quoted 7 lines
Quoted 1 line

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
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Tested-by on v1 1/1
#5 lore raw
In reply to 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")
---
 sound/pci/fm801.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/pci/fm801.c +2 -2
index 2e402ece4c86..8e6b04b39dcc 100644
@@ -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
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel