Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging

[linux-2.6-microblaze.git] / drivers / scsi / pm8001 / pm8001_init.c

diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c
index bd626ef..0f7b3ff 100644 (file)
--- a/drivers/scsi/pm8001/pm8001_init.c
+++ b/drivers/scsi/pm8001/pm8001_init.c
@@ -184,7 +184,7 @@ static void pm8001_free(struct pm8001_hba_info *pm8001_ha)
 #ifdef PM8001_USE_TASKLET
 
 /**
- * tasklet for 64 msi-x interrupt handler
+ * pm8001_tasklet() - tasklet for 64 msi-x interrupt handler
  * @opaque: the passed general host adapter struct
  * Note: pm8001_tasklet is common for pm8001 & pm80xx
  */
@@ -864,7 +864,7 @@ void pm8001_get_phy_mask(struct pm8001_hba_info *pm8001_ha, int *phymask)
 }
 
 /**
- * pm8001_set_phy_settings_ven_117c_12Gb : Configure ATTO 12Gb PHY settings
+ * pm8001_set_phy_settings_ven_117c_12G() : Configure ATTO 12Gb PHY settings
  * @pm8001_ha : our adapter
  */
 static
@@ -963,6 +963,7 @@ static u32 pm8001_request_msix(struct pm8001_hba_info *pm8001_ha)
 {
        u32 i = 0, j = 0;
        int flag = 0, rc = 0;
+       int nr_irqs = pm8001_ha->number_of_intr;
 
        if (pm8001_ha->chip_id != chip_8001)
                flag &= ~IRQF_SHARED;
@@ -971,7 +972,10 @@ static u32 pm8001_request_msix(struct pm8001_hba_info *pm8001_ha)
                   "pci_enable_msix request number of intr %d\n",
                   pm8001_ha->number_of_intr);
 
-       for (i = 0; i < pm8001_ha->number_of_intr; i++) {
+       if (nr_irqs > ARRAY_SIZE(pm8001_ha->intr_drvname))
+               nr_irqs = ARRAY_SIZE(pm8001_ha->intr_drvname);
+
+       for (i = 0; i < nr_irqs; i++) {
                snprintf(pm8001_ha->intr_drvname[i],
                        sizeof(pm8001_ha->intr_drvname[0]),
                        "%s-%d", pm8001_ha->name, i);