Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel...

[linux-2.6-microblaze.git] / sound / pci / bt87x.c

diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c
index 058b997..5925b71 100644 (file)
--- a/sound/pci/bt87x.c
+++ b/sound/pci/bt87x.c
@@ -27,7 +27,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/bitops.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -690,8 +690,7 @@ static int snd_bt87x_free(struct snd_bt87x *chip)
                snd_bt87x_stop(chip);
        if (chip->irq >= 0)
                free_irq(chip->irq, chip);
-       if (chip->mmio)
-               iounmap(chip->mmio);
+       iounmap(chip->mmio);
        pci_release_regions(chip->pci);
        pci_disable_device(chip->pci);
        kfree(chip);