aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/mtip32xx
diff options
context:
space:
mode:
authorAlexander Gordeev <agordeev@redhat.com>2014-02-19 03:58:15 -0500
committerJens Axboe <axboe@fb.com>2014-02-21 18:45:26 -0500
commitcf91f39b1704f456b00ddaa1a7294919d97fb355 (patch)
treec3e737b6d778967e0754120e64ba77bfe0a227d2 /drivers/block/mtip32xx
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 <agordeev@redhat.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Asai Thambi S P <asamymuthupa@micron.com> Cc: linux-pci@vger.kernel.org Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/mtip32xx')
-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,
4615 if (rv) { 4615 if (rv) {
4616 dev_warn(&pdev->dev, 4616 dev_warn(&pdev->dev,
4617 "Unable to enable MSI interrupt.\n"); 4617 "Unable to enable MSI interrupt.\n");
4618 goto block_initialize_err; 4618 goto msi_initialize_err;
4619 } 4619 }
4620 4620
4621 /* Initialize the block layer. */ 4621 /* Initialize the block layer. */
@@ -4645,6 +4645,8 @@ static int mtip_pci_probe(struct pci_dev *pdev,
4645 4645
4646block_initialize_err: 4646block_initialize_err:
4647 pci_disable_msi(pdev); 4647 pci_disable_msi(pdev);
4648
4649msi_initialize_err:
4648 if (dd->isr_workq) { 4650 if (dd->isr_workq) {
4649 flush_workqueue(dd->isr_workq); 4651 flush_workqueue(dd->isr_workq);
4650 destroy_workqueue(dd->isr_workq); 4652 destroy_workqueue(dd->isr_workq);