diff options
Diffstat (limited to 'sound/ppc/pmac.c')
-rw-r--r-- | sound/ppc/pmac.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index 5a13b22748b2..13146d701413 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c | |||
@@ -20,7 +20,7 @@ | |||
20 | */ | 20 | */ |
21 | 21 | ||
22 | 22 | ||
23 | #include <asm/io.h> | 23 | #include <linux/io.h> |
24 | #include <asm/irq.h> | 24 | #include <asm/irq.h> |
25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
@@ -867,16 +867,11 @@ static int snd_pmac_free(struct snd_pmac *chip) | |||
867 | snd_pmac_dbdma_free(chip, &chip->capture.cmd); | 867 | snd_pmac_dbdma_free(chip, &chip->capture.cmd); |
868 | snd_pmac_dbdma_free(chip, &chip->extra_dma); | 868 | snd_pmac_dbdma_free(chip, &chip->extra_dma); |
869 | snd_pmac_dbdma_free(chip, &emergency_dbdma); | 869 | snd_pmac_dbdma_free(chip, &emergency_dbdma); |
870 | if (chip->macio_base) | 870 | iounmap(chip->macio_base); |
871 | iounmap(chip->macio_base); | 871 | iounmap(chip->latch_base); |
872 | if (chip->latch_base) | 872 | iounmap(chip->awacs); |
873 | iounmap(chip->latch_base); | 873 | iounmap(chip->playback.dma); |
874 | if (chip->awacs) | 874 | iounmap(chip->capture.dma); |
875 | iounmap(chip->awacs); | ||
876 | if (chip->playback.dma) | ||
877 | iounmap(chip->playback.dma); | ||
878 | if (chip->capture.dma) | ||
879 | iounmap(chip->capture.dma); | ||
880 | 875 | ||
881 | if (chip->node) { | 876 | if (chip->node) { |
882 | int i; | 877 | int i; |