aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/floppy_64.h
diff options
context:
space:
mode:
authorJonathan Herman <hermanjl@cs.unc.edu>2013-01-17 16:15:55 -0500
committerJonathan Herman <hermanjl@cs.unc.edu>2013-01-17 16:15:55 -0500
commit8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
treea8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /arch/sparc/include/asm/floppy_64.h
parent406089d01562f1e2bf9f089fd7637009ebaad589 (diff)
Patched in Tegra support.
Diffstat (limited to 'arch/sparc/include/asm/floppy_64.h')
-rw-r--r--arch/sparc/include/asm/floppy_64.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/floppy_64.h b/arch/sparc/include/asm/floppy_64.h
index e204f902e6c..bcef1f5a2a6 100644
--- a/arch/sparc/include/asm/floppy_64.h
+++ b/arch/sparc/include/asm/floppy_64.h
@@ -161,7 +161,10 @@ unsigned long pdma_areasize;
161static void sun_fd_disable_dma(void) 161static void sun_fd_disable_dma(void)
162{ 162{
163 doing_pdma = 0; 163 doing_pdma = 0;
164 pdma_base = NULL; 164 if (pdma_base) {
165 mmu_unlockarea(pdma_base, pdma_areasize);
166 pdma_base = NULL;
167 }
165} 168}
166 169
167static void sun_fd_set_dma_mode(int mode) 170static void sun_fd_set_dma_mode(int mode)
@@ -191,6 +194,7 @@ static void sun_fd_set_dma_count(int length)
191 194
192static void sun_fd_enable_dma(void) 195static void sun_fd_enable_dma(void)
193{ 196{
197 pdma_vaddr = mmu_lockarea(pdma_vaddr, pdma_size);
194 pdma_base = pdma_vaddr; 198 pdma_base = pdma_vaddr;
195 pdma_areasize = pdma_size; 199 pdma_areasize = pdma_size;
196} 200}