diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-07-16 21:40:03 +0300 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2017-07-18 11:55:40 +0200 |
| commit | 610e1ae9b533be82b3aa118b907e0a703256913d (patch) | |
| tree | 7f658c1158494fc3a411f6673321e55cb8485275 /sound | |
| parent | ALSA: hda/realtek - Update headset mode for ALC298 (diff) | |
| download | linux-dev-610e1ae9b533be82b3aa118b907e0a703256913d.tar.xz linux-dev-610e1ae9b533be82b3aa118b907e0a703256913d.zip | |
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")
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>
Cc: <stable@vger.kernel.org> # v4.5+
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/fm801.c | 4 |
1 files 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; |