patch-1.3.40 linux/drivers/scsi/scsi.c

• Lines: 45
• Date: Sat Nov 11 10:58:56 1995
• Orig file: v1.3.39/linux/drivers/scsi/scsi.c
• Orig date: Thu Nov 9 11:23:50 1995

diff -u --recursive --new-file v1.3.39/linux/drivers/scsi/scsi.c linux/drivers/scsi/scsi.c
@@ -2499,7 +2499,8 @@
 	for(i=0; i < dma_sectors >> 3; i++)
 	    scsi_init_free(dma_malloc_pages[i], PAGE_SIZE);
 	if (dma_malloc_pages)
-	    scsi_init_free((char *) dma_malloc_pages, dma_sectors>>1);
+	    scsi_init_free((char *) dma_malloc_pages,
+                           (dma_sectors>>3)*sizeof(*dma_malloc_pages));
 	dma_malloc_pages = NULL;
 	if (dma_malloc_freelist)
 	    scsi_init_free(dma_malloc_freelist, dma_sectors>>3);
@@ -2555,8 +2556,10 @@
 	memset(new_dma_malloc_freelist, 0, new_dma_sectors >> 3);
 	
 	new_dma_malloc_pages = (unsigned char **)
-	    scsi_init_malloc(new_dma_sectors >> 1, GFP_ATOMIC);
-	memset(new_dma_malloc_pages, 0, new_dma_sectors >> 1);
+	    scsi_init_malloc((new_dma_sectors>>3)*sizeof(*new_dma_malloc_pages),
+                             GFP_ATOMIC);
+	memset(new_dma_malloc_pages, 0,
+               (new_dma_sectors>>3)*sizeof(*new_dma_malloc_pages));
     }
     
     /*
@@ -2582,8 +2585,10 @@
     
     if (dma_malloc_pages)
     {
-	memcpy(new_dma_malloc_pages, dma_malloc_pages, dma_sectors >> 1);
-	scsi_init_free((char *) dma_malloc_pages, dma_sectors>>1);
+	memcpy(new_dma_malloc_pages, dma_malloc_pages,
+               (dma_sectors>>3)*sizeof(*dma_malloc_pages));
+	scsi_init_free((char *) dma_malloc_pages,
+                       (dma_sectors>>3)*sizeof(*dma_malloc_pages));
     }
     
     dma_free_sectors += new_dma_sectors - dma_sectors;
@@ -3084,7 +3089,7 @@
     
     /* One pointer per page for the page list */
     dma_malloc_pages = (unsigned char **)
-	scsi_init_malloc(dma_sectors >> 1, GFP_ATOMIC);
+	scsi_init_malloc((dma_sectors >> 3)*sizeof(*dma_malloc_pages), GFP_ATOMIC);
     dma_malloc_pages[0] = (unsigned char *)
 	scsi_init_malloc(PAGE_SIZE, GFP_ATOMIC | GFP_DMA);
     return 0;