patch-2.3.43 linux/drivers/scsi/pluto.c

Next file: linux/drivers/scsi/ql12160_fw.h
Previous file: linux/drivers/scsi/mesh.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.42/linux/drivers/scsi/pluto.c linux/drivers/scsi/pluto.c
@@ -112,7 +112,7 @@
 #endif
 			return 0;
 	}
-	fcs = (struct ctrl_inquiry *) scsi_init_malloc (sizeof (struct ctrl_inquiry) * fcscount, GFP_DMA);
+	fcs = (struct ctrl_inquiry *) kmalloc (sizeof (struct ctrl_inquiry) * fcscount, GFP_DMA);
 	if (!fcs) {
 		printk ("PLUTO: Not enough memory to probe\n");
 		return 0;
@@ -265,7 +265,7 @@
 		} else
 			fc->fcp_register(fc, TYPE_SCSI_FCP, 1);
 	}
-	scsi_init_free((char *)fcs, sizeof (struct ctrl_inquiry) * fcscount);
+	kfree((char *)fcs);
 	if (nplutos)
 		printk ("PLUTO: Total of %d SparcSTORAGE Arrays found\n", nplutos);
 	return nplutos;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)