diff --git a/sys/dev/hpt27xx/hpt27xx_config.c b/sys/dev/hpt27xx/hpt27xx_config.c index c9687bc7afe5..09e88fc18e43 100644 --- a/sys/dev/hpt27xx/hpt27xx_config.c +++ b/sys/dev/hpt27xx/hpt27xx_config.c @@ -60,7 +60,7 @@ int init_config(void) const char driver_name[] = "hpt27xx"; const char driver_name_long[] = "RocketRAID 27xx controller driver"; -const char driver_ver[] = "v1.2.7"; +const char driver_ver[] = "v1.2.8"; int osm_max_targets = 0xff; diff --git a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c index 6df9acaacc6a..b2e9ed25ee55 100644 --- a/sys/dev/hpt27xx/hpt27xx_osm_bsd.c +++ b/sys/dev/hpt27xx/hpt27xx_osm_bsd.c @@ -31,7 +31,7 @@ #include #include -static HIM *hpt_match(device_t dev) +static HIM *hpt_match(device_t dev, int scan) { PCI_ID pci_id; HIM *him; @@ -39,7 +39,7 @@ static HIM *hpt_match(device_t dev) for (him = him_list; him; him = him->next) { for (i=0; him->get_supported_device_id(i, &pci_id); i++) { - if (him->get_controller_count) + if (scan && him->get_controller_count) him->get_controller_count(&pci_id,0,0); if ((pci_get_vendor(dev) == pci_id.vid) && (pci_get_device(dev) == pci_id.did)){ @@ -54,7 +54,7 @@ static int hpt_probe(device_t dev) { HIM *him; - him = hpt_match(dev); + him = hpt_match(dev, 0); if (him != NULL) { KdPrint(("hpt_probe: adapter at PCI %d:%d:%d, IRQ %d", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev), pci_get_irq(dev) @@ -77,7 +77,7 @@ static int hpt_attach(device_t dev) KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev))); - him = hpt_match(dev); + him = hpt_match(dev, 1); hba->ext_type = EXT_TYPE_HBA; hba->ldm_adapter.him = him; pci_enable_busmaster(dev); diff --git a/sys/dev/hptnr/hptnr_config.c b/sys/dev/hptnr/hptnr_config.c index 10695936e9ca..2164f17efc4b 100644 --- a/sys/dev/hptnr/hptnr_config.c +++ b/sys/dev/hptnr/hptnr_config.c @@ -46,7 +46,7 @@ int init_config(void) const char driver_name[] = "hptnr"; const char driver_name_long[] = "R750/DC7280 controller driver"; -const char driver_ver[] = "v1.1.4"; +const char driver_ver[] = "v1.1.5"; int osm_max_targets = 0xff; diff --git a/sys/dev/hptnr/hptnr_osm_bsd.c b/sys/dev/hptnr/hptnr_osm_bsd.c index 338770c8e834..4d712b31c6f8 100644 --- a/sys/dev/hptnr/hptnr_osm_bsd.c +++ b/sys/dev/hptnr/hptnr_osm_bsd.c @@ -32,7 +32,7 @@ #include int msi = 0; int debug_flag = 0; -static HIM *hpt_match(device_t dev) +static HIM *hpt_match(device_t dev, int scan) { PCI_ID pci_id; HIM *him; @@ -40,7 +40,7 @@ static HIM *hpt_match(device_t dev) for (him = him_list; him; him = him->next) { for (i=0; him->get_supported_device_id(i, &pci_id); i++) { - if (him->get_controller_count) + if (scan && him->get_controller_count) him->get_controller_count(&pci_id,0,0); if ((pci_get_vendor(dev) == pci_id.vid) && (pci_get_device(dev) == pci_id.did)){ @@ -56,7 +56,7 @@ static int hpt_probe(device_t dev) { HIM *him; - him = hpt_match(dev); + him = hpt_match(dev, 0); if (him != NULL) { KdPrint(("hpt_probe: adapter at PCI %d:%d:%d, IRQ %d", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev), pci_get_irq(dev) @@ -79,7 +79,7 @@ static int hpt_attach(device_t dev) KdPrint(("hpt_attach(%d/%d/%d)", pci_get_bus(dev), pci_get_slot(dev), pci_get_function(dev))); - him = hpt_match(dev); + him = hpt_match(dev, 1); hba->ext_type = EXT_TYPE_HBA; hba->ldm_adapter.him = him;