| Message ID | f724cdc95b9e1eb578cf7297ad32b830885f681c.1391512266.git.agordeev@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On 02/04/2014 12:17 PM, Alexander Gordeev wrote: > When enabling MSI-X if a call to request_irq() failed > pm8001_setup_msix() still returns success. This udate > fixes the described misbehaviour. > > Signed-off-by: Alexander Gordeev <agordeev@redhat.com> > Cc: xjtuwjp@gmail.com > Cc: lindar_liu@usish.com > Cc: linux-scsi@vger.kernel.org > Cc: linux-pci@vger.kernel.org > --- > drivers/scsi/pm8001/pm8001_init.c | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c > index 73a120d..efffbb9 100644 > --- a/drivers/scsi/pm8001/pm8001_init.c > +++ b/drivers/scsi/pm8001/pm8001_init.c > @@ -739,9 +739,10 @@ static u32 pm8001_setup_msix(struct pm8001_hba_info *pm8001_ha) > pm8001_ha->irq_vector[i].irq_id = i; > pm8001_ha->irq_vector[i].drv_inst = pm8001_ha; > > - if (request_irq(pm8001_ha->msix_entries[i].vector, > + rc = request_irq(pm8001_ha->msix_entries[i].vector, > pm8001_interrupt_handler_msix, flag, > - intr_drvname[i], &(pm8001_ha->irq_vector[i]))) { > + intr_drvname[i], &(pm8001_ha->irq_vector[i])); > + if (rc) { > for (j = 0; j < i; j++) > free_irq( > pm8001_ha->msix_entries[j].vector, > Thanks, looks fine. Acked-by: Jack Wang <xjtuwjp@gmail.com> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index 73a120d..efffbb9 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c @@ -739,9 +739,10 @@ static u32 pm8001_setup_msix(struct pm8001_hba_info *pm8001_ha) pm8001_ha->irq_vector[i].irq_id = i; pm8001_ha->irq_vector[i].drv_inst = pm8001_ha; - if (request_irq(pm8001_ha->msix_entries[i].vector, + rc = request_irq(pm8001_ha->msix_entries[i].vector, pm8001_interrupt_handler_msix, flag, - intr_drvname[i], &(pm8001_ha->irq_vector[i]))) { + intr_drvname[i], &(pm8001_ha->irq_vector[i])); + if (rc) { for (j = 0; j < i; j++) free_irq( pm8001_ha->msix_entries[j].vector,
When enabling MSI-X if a call to request_irq() failed pm8001_setup_msix() still returns success. This udate fixes the described misbehaviour. Signed-off-by: Alexander Gordeev <agordeev@redhat.com> Cc: xjtuwjp@gmail.com Cc: lindar_liu@usish.com Cc: linux-scsi@vger.kernel.org Cc: linux-pci@vger.kernel.org --- drivers/scsi/pm8001/pm8001_init.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)