diff --git a/[refs] b/[refs] index 12657296eabf..e8a4eee3b2f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c6cd7d7efe2302697a3cbde718e8e3b0d88ba706 +refs/heads/master: 2f93d797ea92113a73c72728c475455cb1409fb3 diff --git a/trunk/sound/pci/bt87x.c b/trunk/sound/pci/bt87x.c index c9a2421cf6f0..4ecdd635ed1d 100644 --- a/trunk/sound/pci/bt87x.c +++ b/trunk/sound/pci/bt87x.c @@ -681,15 +681,12 @@ static struct snd_kcontrol_new snd_bt87x_capture_source = { static int snd_bt87x_free(struct snd_bt87x *chip) { - if (chip->mmio) { + if (chip->mmio) snd_bt87x_stop(chip); - if (chip->irq >= 0) - synchronize_irq(chip->irq); - - iounmap(chip->mmio); - } if (chip->irq >= 0) free_irq(chip->irq, chip); + if (chip->mmio) + iounmap(chip->mmio); pci_release_regions(chip->pci); pci_disable_device(chip->pci); kfree(chip);