Enable MSI if available/supported. Signed-off-by: Wayne Boyer <wayneb@xxxxxxxxxxxxxxxxxx> --- drivers/scsi/ipr.c | 7 +++++++ drivers/scsi/ipr.h | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) Index: linux-2.6/drivers/scsi/ipr.c =================================================================== --- linux-2.6.orig/drivers/scsi/ipr.c 2009-01-21 10:19:59.000000000 -0800 +++ linux-2.6/drivers/scsi/ipr.c 2009-01-22 15:50:59.000000000 -0800 @@ -7147,6 +7147,7 @@ ENTER; free_irq(pdev->irq, ioa_cfg); + pci_disable_msi(pdev); iounmap(ioa_cfg->hdw_dma_regs); pci_release_regions(pdev); ipr_free_mem(ioa_cfg); @@ -7432,6 +7433,11 @@ goto out; } + if (!(rc = pci_enable_msi(pdev))) + dev_info(&pdev->dev, "MSI enabled\n"); + else if (ipr_debug) + dev_info(&pdev->dev, "Cannot enable MSI\n"); + dev_info(&pdev->dev, "Found IOA with IRQ: %d\n", pdev->irq); host = scsi_host_alloc(&driver_template, sizeof(*ioa_cfg)); @@ -7574,6 +7580,7 @@ out_scsi_host_put: scsi_host_put(host); out_disable: + pci_disable_msi(pdev); pci_disable_device(pdev); goto out; } Index: linux-2.6/drivers/scsi/ipr.h =================================================================== --- linux-2.6.orig/drivers/scsi/ipr.h 2009-01-21 10:19:57.000000000 -0800 +++ linux-2.6/drivers/scsi/ipr.h 2009-01-21 15:23:02.000000000 -0800 @@ -37,8 +37,8 @@ /* * Literals */ -#define IPR_DRIVER_VERSION "2.4.1" -#define IPR_DRIVER_DATE "(April 24, 2007)" +#define IPR_DRIVER_VERSION "2.4.2" +#define IPR_DRIVER_DATE "(January 21, 2009)" /* * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
