diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-01 19:07:50 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-01 19:07:50 +0200 |
| commit | 29fda25a2d31098044f8dfa177c4d2834071828e (patch) | |
| tree | 9e4be11c49a4405c19ece8f81fbb1db478da1055 /sound/pci/fm801.c | |
| parent | Merge branch 'revert-ipv6-const' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-29fda25a2d31098044f8dfa177c4d2834071828e.tar.xz linux-29fda25a2d31098044f8dfa177c4d2834071828e.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two minor conflicts in virtio_net driver (bug fix overlapping addition
of a helper) and MAINTAINERS (new driver edit overlapping revamp of
PHY entry).
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/pci/fm801.c')
| -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; |