From: Alexander Gordeev <agordeev@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Alexander Gordeev <agordeev@redhat.com>,
Jens Axboe <axboe@kernel.dk>,
Asai Thambi S P <asamymuthupa@micron.com>,
linux-pci@vger.kernel.org
Subject: [PATCH 3/9] mtip32xx: Remove superfluous call to pci_disable_msi()
Date: Wed, 19 Feb 2014 09:58:15 +0100 [thread overview]
Message-ID: <eb0c7ed053e6e047d0d09ea7e803dd39a1ef71ed.1392799751.git.agordeev@redhat.com> (raw)
In-Reply-To: <cover.1392799751.git.agordeev@redhat.com>
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
---
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 5160269..5299a65 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);
--
1.7.7.6
next prev parent reply other threads:[~2014-02-19 8:56 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-19 8:58 [PATCH 0/9] block: Use pci_enable_msix_range() instead of pci_enable_msix() Alexander Gordeev
2014-02-19 8:58 ` [PATCH 1/9] cciss: Fallback to MSI rather than to INTx if MSI-X failed Alexander Gordeev
2014-02-19 8:58 ` [PATCH 2/9] cciss: Use pci_enable_msix_range() instead of pci_enable_msix() Alexander Gordeev
2014-02-19 8:58 ` Alexander Gordeev [this message]
2014-02-19 8:58 ` [PATCH 4/9] mtip32xx: " Alexander Gordeev
2014-02-19 8:58 ` [PATCH 5/9] rsxx: " Alexander Gordeev
2014-02-19 8:58 ` [PATCH 6/9] skd: Fix out of array boundary access Alexander Gordeev
2014-02-19 8:58 ` [PATCH 7/9] skd: Fix incomplete cleanup of MSI-X interrupt Alexander Gordeev
2014-02-19 8:58 ` [PATCH 8/9] skd: Use unified access to skdev->msix_entries throughout the code Alexander Gordeev
2014-02-19 8:58 ` [PATCH 9/9] skd: Use pci_enable_msix_range() instead of pci_enable_msix() Alexander Gordeev
2014-02-21 23:46 ` [PATCH 0/9] block: " Jens Axboe
2014-02-22 9:38 ` Alexander Gordeev
2014-02-24 17:16 ` Jens Axboe
2014-02-25 21:31 ` [PATCH 10/9] skd: Use pci_enable_msix_exact() instead of pci_enable_msix_range() Alexander Gordeev
2014-02-25 22:19 ` Jens Axboe
2014-02-25 21:33 ` [PATCH 11/9] mtip32xx: Use pci_enable_msi() instead of pci_enable_msi_range() Alexander Gordeev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eb0c7ed053e6e047d0d09ea7e803dd39a1ef71ed.1392799751.git.agordeev@redhat.com \
--to=agordeev@redhat.com \
--cc=asamymuthupa@micron.com \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®