aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gordeev <[email protected]>2014-02-19 09:58:15 +0100
committerJens Axboe <[email protected]>2014-02-21 15:45:26 -0800
commitcf91f39b1704f456b00ddaa1a7294919d97fb355 (patch)
treec3e737b6d778967e0754120e64ba77bfe0a227d2
parentf597f6b8dfaa033be3b3b755e6c0ab3caee96dcd (diff)
mtip32xx: Remove superfluous call to pci_disable_msi()
There is no need to call pci_disable_msi() in case the previous call to pci_enable_msi() failed Signed-off-by: Alexander Gordeev <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Asai Thambi S P <[email protected]> Cc: [email protected] Signed-off-by: Jens Axboe <[email protected]>
-rw-r--r--drivers/block/mtip32xx/mtip32xx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 516026954be6..5299a65182db 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -4615,7 +4615,7 @@ static int mtip_pci_probe(struct pci_dev *pdev,
if (rv) {
dev_warn(&pdev->dev,
"Unable to enable MSI interrupt.\n");
- goto block_initialize_err;
+ goto msi_initialize_err;
}
/* Initialize the block layer. */
@@ -4645,6 +4645,8 @@ static int mtip_pci_probe(struct pci_dev *pdev,
block_initialize_err:
pci_disable_msi(pdev);
+
+msi_initialize_err:
if (dd->isr_workq) {
flush_workqueue(dd->isr_workq);
destroy_workqueue(dd->isr_workq);