From: Alexander Gordeev Date: Mon, 18 Aug 2014 06:01:41 +0000 (+0200) Subject: hpsa: Fallback to MSI rather than to INTx if MSI-X failed X-Git-Tag: firefly_0821_release~176^2~3131^2^2~191 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=49bd1a8f96d7b169edb11eb41e084b1b1669557a;p=firefly-linux-kernel-4.4.55.git hpsa: Fallback to MSI rather than to INTx if MSI-X failed Currently the driver falls back to INTx mode when MSI-X initialization failed. This is a suboptimal behaviour for chips that also support MSI. This update changes that behaviour and falls back to MSI mode in case MSI-X mode initialization failed. Signed-off-by: Alexander Gordeev Acked-by: "Stephen M. Cameron" Cc: iss_storagedev@hp.com Cc: linux-scsi@vger.kernel.org Cc: linux-pci@vger.kernel.org Signed-off-by: Christoph Hellwig --- diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 6b35d0dfe64c..a9c4c9f05bb4 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -6176,7 +6176,6 @@ static void hpsa_interrupt_mode(struct ctlr_info *h) dev_warn(&h->pdev->dev, "MSI-X init failed %d\n", err); h->msix_vector = 0; - goto default_int_mode; } } if (pci_find_capability(h->pdev, PCI_CAP_ID_MSI)) {