From 371ff93a72a1aa14773e2e17548796db8c004a6c Mon Sep 17 00:00:00 2001 From: Alexander Gordeev Date: Wed, 26 Feb 2014 10:02:41 +0100 Subject: [PATCH] cciss: 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 Cc: Mike Miller Cc: iss_storagedev@hp.com Cc: Jens Axboe Cc: linux-pci@vger.kernel.org Signed-off-by: Jens Axboe --- drivers/block/cciss.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 036e8ab86c71..73894ca33956 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -4092,11 +4092,9 @@ static void cciss_interrupt_mode(ctlr_info_t *h) if (err > 0) { dev_warn(&h->pdev->dev, "only %d MSI-X vectors available\n", err); - goto default_int_mode; } else { dev_warn(&h->pdev->dev, "MSI-X init failed %d\n", err); - goto default_int_mode; } } if (pci_find_capability(h->pdev, PCI_CAP_ID_MSI)) {