Commit 4f767bbe authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman

ALSA: fm801: Initialize chip after IRQ handler is registered

commit 610e1ae9 upstream.

The commit b56fa687 ("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: b56fa687 ("ALSA: fm801: detect FM-only card earlier")
Reported-by: default avatarÉmeric MASCHINO <emeric.maschino@gmail.com>
Tested-by: default avatarÉmeric MASCHINO <emeric.maschino@gmail.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f6bf07da
...@@ -1235,8 +1235,6 @@ static int snd_fm801_create(struct snd_card *card, ...@@ -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 ((chip->tea575x_tuner & TUNER_ONLY) == 0) {
if (devm_request_irq(&pci->dev, pci->irq, snd_fm801_interrupt, if (devm_request_irq(&pci->dev, pci->irq, snd_fm801_interrupt,
IRQF_SHARED, KBUILD_MODNAME, chip)) { IRQF_SHARED, KBUILD_MODNAME, chip)) {
...@@ -1248,6 +1246,8 @@ static int snd_fm801_create(struct snd_card *card, ...@@ -1248,6 +1246,8 @@ static int snd_fm801_create(struct snd_card *card,
pci_set_master(pci); pci_set_master(pci);
} }
snd_fm801_chip_init(chip);
if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) { if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) {
snd_fm801_free(chip); snd_fm801_free(chip);
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment