diff options
| author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2011-03-27 08:52:06 -0400 |
|---|---|---|
| committer | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2011-11-04 15:53:02 -0400 |
| commit | aba2080f3f1639f9202f1a52993669844abcfb80 (patch) | |
| tree | 3eacb6848776d7418f62f296d850ace5343ecf9d /drivers/block/nvme.c | |
| parent | 7f53f9d2424533256ae86f7df5661a17de743de8 (diff) | |
| download | lwn-aba2080f3f1639f9202f1a52993669844abcfb80.tar.gz lwn-aba2080f3f1639f9202f1a52993669844abcfb80.zip | |
NVMe: Fix warning in free_irq
We need to clear the affinity mask before calling free_irq()
Reported-by: Shane Michael Matthews <shane.matthews@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers/block/nvme.c')
| -rw-r--r-- | drivers/block/nvme.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c index 014a7f6e39bc..bcc780ac4ec0 100644 --- a/drivers/block/nvme.c +++ b/drivers/block/nvme.c @@ -781,8 +781,10 @@ static int adapter_delete_sq(struct nvme_dev *dev, u16 sqid) static void nvme_free_queue(struct nvme_dev *dev, int qid) { struct nvme_queue *nvmeq = dev->queues[qid]; + int vector = dev->entry[nvmeq->cq_vector].vector; - free_irq(dev->entry[nvmeq->cq_vector].vector, nvmeq); + irq_set_affinity_hint(vector, NULL); + free_irq(vector, nvmeq); /* Don't tell the adapter to delete the admin queue */ if (qid) { |