From aa180761c25f925eda2cf334c72fcc1230dfd1e3 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 30 Apr 2012 11:57:44 -0700 Subject: [PATCH] --- yaml --- r: 302549 b: refs/heads/master c: fc25f79af321c01a739150ba2c09435cf977a63d h: refs/heads/master i: 302547: 95965706302d0079f627f3a88d4abfb305951fae v: v3 --- [refs] | 2 +- trunk/drivers/scsi/isci/init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a119c8430642..ad87733d977a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08e73be56b6b2e5459638481a54b755ed562ada8 +refs/heads/master: fc25f79af321c01a739150ba2c09435cf977a63d diff --git a/trunk/drivers/scsi/isci/init.c b/trunk/drivers/scsi/isci/init.c index fdae42f572b6..9e1c83e425ed 100644 --- a/trunk/drivers/scsi/isci/init.c +++ b/trunk/drivers/scsi/isci/init.c @@ -639,7 +639,7 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devic if (!orom) orom = isci_request_oprom(pdev); - for (i = 0; orom && i < ARRAY_SIZE(orom->ctrl); i++) { + for (i = 0; orom && i < num_controllers(pdev); i++) { if (sci_oem_parameters_validate(&orom->ctrl[i], orom->hdr.version)) { dev_warn(&pdev->dev,