| From 610e1ae9b533be82b3aa118b907e0a703256913d Mon Sep 17 00:00:00 2001 |
| From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Date: Sun, 16 Jul 2017 21:40:03 +0300 |
| Subject: ALSA: fm801: Initialize chip after IRQ handler is registered |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| |
| commit 610e1ae9b533be82b3aa118b907e0a703256913d upstream. |
| |
| 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> |
| Tested-by: Émeric MASCHINO <emeric.maschino@gmail.com> |
| Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/pci/fm801.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/sound/pci/fm801.c |
| +++ b/sound/pci/fm801.c |
| @@ -1235,8 +1235,6 @@ static int snd_fm801_create(struct snd_c |
| } |
| } |
| |
| - 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_c |
| 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; |
