提交 da57a404 编写于 作者: J Jing Xiangfeng 提交者: Yang Yingliang

thunderbolt: Add the missed ida_simple_remove() in ring_request_msix()

commit 7342ca34 upstream.

ring_request_msix() misses to call ida_simple_remove() in an error path.
Add a label 'err_ida_remove' and jump to it.

Fixes: 046bee1f ("thunderbolt: Add MSI-X support")
Cc: stable@vger.kernel.org
Signed-off-by: NJing Xiangfeng <jingxiangfeng@huawei.com>
Reviewed-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: NMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 050060e0
...@@ -408,12 +408,23 @@ static int ring_request_msix(struct tb_ring *ring, bool no_suspend) ...@@ -408,12 +408,23 @@ static int ring_request_msix(struct tb_ring *ring, bool no_suspend)
ring->vector = ret; ring->vector = ret;
ring->irq = pci_irq_vector(ring->nhi->pdev, ring->vector); ret = pci_irq_vector(ring->nhi->pdev, ring->vector);
if (ring->irq < 0) if (ret < 0)
return ring->irq; goto err_ida_remove;
ring->irq = ret;
irqflags = no_suspend ? IRQF_NO_SUSPEND : 0; irqflags = no_suspend ? IRQF_NO_SUSPEND : 0;
return request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring); ret = request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring);
if (ret)
goto err_ida_remove;
return 0;
err_ida_remove:
ida_simple_remove(&nhi->msix_ida, ring->vector);
return ret;
} }
static void ring_release_msix(struct tb_ring *ring) static void ring_release_msix(struct tb_ring *ring)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册