[parisc-linux-cvs] ccio fault ... closing bug #105

Ryan Bradetich rbrad@beavis.ybsoft.com
Sat, 14 Apr 2001 00:57:30 -0600


Ok... this was a stupid error.  This patch fixes the bug report
for bug #105.  Grant, this also probably needs to be changed 
in the SBA code.

- Ryan

Index: ccio-dma.c
===================================================================
RCS file: /home/cvs/parisc/linux/arch/parisc/kernel/ccio-dma.c,v
retrieving revision 1.29
diff -u -p -r1.29 ccio-dma.c
--- ccio-dma.c	2001/04/06 05:10:54	1.29
+++ ccio-dma.c	2001/04/14 06:47:33
@@ -362,8 +362,8 @@ ccio_alloc_range(struct ioc *ioc, size_t
 #endif
 	
 	ASSERT(pages_needed);
-	ASSERT((pages_needed * IOVP_SIZE) < DMA_CHUNK_SIZE);
-	ASSERT(pages_needed < BITS_PER_LONG);
+	ASSERT((pages_needed * IOVP_SIZE) <= DMA_CHUNK_SIZE);
+	ASSERT(pages_needed <= BITS_PER_LONG);
 	ASSERT(0 == (size & ~IOVP_MASK));
 
 	mask = ~(mask >> pages_needed);
@@ -437,8 +437,8 @@ ccio_free_range(struct ioc *ioc, dma_add
 	unsigned int pages_mapped = (size >> IOVP_SHIFT);
 
 	ASSERT(pages_mapped);
-	ASSERT((pages_mapped * IOVP_SIZE) < DMA_CHUNK_SIZE);
-	ASSERT(pages_mapped < BITS_PER_LONG);
+	ASSERT((pages_mapped * IOVP_SIZE) <= DMA_CHUNK_SIZE);
+	ASSERT(pages_mapped <= BITS_PER_LONG);
 
 	mask = ~(mask >> pages_mapped);