diff options
| author | Alexander Gordeev <agordeev@redhat.com> | 2014-02-19 09:58:15 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-02-22 00:45:26 +0100 |
| commit | cf91f39b1704f456b00ddaa1a7294919d97fb355 (patch) | |
| tree | c3e737b6d778967e0754120e64ba77bfe0a227d2 /drivers/block | |
| parent | drbd: Fix future possible NULL pointer dereference (diff) | |
| download | linux-cf91f39b1704f456b00ddaa1a7294919d97fb355.tar.xz linux-cf91f39b1704f456b00ddaa1a7294919d97fb355.zip | |
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')
| -rw-r--r-- | drivers/block/mtip32xx/mtip32xx.c | 4 |
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); |