patch-2.4.0-test11 linux/drivers/scsi/megaraid.c
Next file: linux/drivers/scsi/pas16.c
Previous file: linux/drivers/scsi/mac_scsi.c
Back to the patch index
Back to the overall index
- Lines: 45
- Date:
Wed Nov 8 17:09:50 2000
- Orig file:
v2.4.0-test10/linux/drivers/scsi/megaraid.c
- Orig date:
Sun Oct 8 10:50:24 2000
diff -u --recursive --new-file v2.4.0-test10/linux/drivers/scsi/megaraid.c linux/drivers/scsi/megaraid.c
@@ -1491,21 +1491,6 @@
pciDev,
pdev->slot_name);
- /*
- * Dont crash on boot with AMI cards configured for I2O.
- * (our I2O code will find them then they will fail oddly until
- * we figure why they upset our I2O code). This driver will die
- * if it tries to boot an I2O mode board and we dont stop it now.
- * - Alan Cox , Red Hat Software, Jan 2000
- */
-
- if((pdev->class >> 8) == PCI_CLASS_INTELLIGENT_I2O)
- {
- printk( KERN_INFO "megaraid: Board configured for I2O, ignoring this card. Reconfigure the card\n"
- KERN_INFO "megaraid: in the BIOS for \"mass storage\" to use it with this driver.\n");
- continue;
- }
-
/* Read the base port and IRQ from PCI */
megaBase = pci_resource_start (pdev, 0);
megaIrq = pdev->irq;
@@ -1517,6 +1502,8 @@
/* Initialize SCSI Host structure */
host = scsi_register (pHostTmpl, sizeof (mega_host_config));
+ if(host == NULL)
+ continue;
megaCfg = (mega_host_config *) host->hostdata;
memset (megaCfg, 0, sizeof (mega_host_config));
@@ -1543,12 +1530,11 @@
megaCtlrs[numCtlrs++] = megaCfg;
if (flag != BOARD_QUARTZ) {
/* Request our IO Range */
- if (check_region (megaBase, 16)) {
+ if (request_region (megaBase, 16, "megaraid")) {
printk (KERN_WARNING "megaraid: Couldn't register I/O range!" CRLFSTR);
scsi_unregister (host);
continue;
}
- request_region (megaBase, 16, "megaraid");
}
/* Request our IRQ */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)