Merge branches 'pm-cpufreq-x86', 'pm-cpufreq-docs' and 'intel_pstate'

[sfrench/cifs-2.6.git] / sound / pci / fm801.c

diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
index 2e402ece4c86d274b40f2e22d659bf63c53f8272..8e6b04b39dcc199a9895f5f7680066ee203fe2ea 100644 (file)
--- 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;