summaryrefslogtreecommitdiffstats
path: root/sys/dev/amr/amr_pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/amr/amr_pci.c')
-rw-r--r--sys/dev/amr/amr_pci.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c
index 783d430..26b9ff8 100644
--- a/sys/dev/amr/amr_pci.c
+++ b/sys/dev/amr/amr_pci.c
@@ -103,7 +103,7 @@ static struct
static int
amr_pci_probe(device_t dev)
{
- int i;
+ int i, sig;
debug_called(1);
@@ -112,9 +112,11 @@ amr_pci_probe(device_t dev)
(pci_get_device(dev) == amr_device_ids[i].device)) {
/* do we need to test for a signature? */
- if ((amr_device_ids[i].flag & PROBE_SIGNATURE) &&
- (pci_read_config(dev, AMR_CFG_SIG, 2) != AMR_SIGNATURE))
- continue;
+ if (amr_device_ids[i].flag & PROBE_SIGNATURE) {
+ sig = pci_read_config(dev, AMR_CFG_SIG, 2);
+ if ((sig != AMR_SIGNATURE_1) && (sig != AMR_SIGNATURE_2))
+ continue;
+ }
device_set_desc(dev, "AMI MegaRAID");
return(-10); /* allow room to be overridden */
}
OpenPOWER on IntegriCloud