Skip to content

Commit 7342ca3

Browse files
hiss2018westeri
authored andcommitted
thunderbolt: Add the missed ida_simple_remove() in ring_request_msix()
ring_request_msix() misses to call ida_simple_remove() in an error path. Add a label 'err_ida_remove' and jump to it. Fixes: 046bee1 ("thunderbolt: Add MSI-X support") Cc: stable@vger.kernel.org Signed-off-by: Jing Xiangfeng <jingxiangfeng@huawei.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
1 parent 3650b22 commit 7342ca3

1 file changed

Lines changed: 15 additions & 4 deletions

File tree

drivers/thunderbolt/nhi.c

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -406,12 +406,23 @@ static int ring_request_msix(struct tb_ring *ring, bool no_suspend)
406406

407407
ring->vector = ret;
408408

409-
ring->irq = pci_irq_vector(ring->nhi->pdev, ring->vector);
410-
if (ring->irq < 0)
411-
return ring->irq;
409+
ret = pci_irq_vector(ring->nhi->pdev, ring->vector);
410+
if (ret < 0)
411+
goto err_ida_remove;
412+
413+
ring->irq = ret;
412414

413415
irqflags = no_suspend ? IRQF_NO_SUSPEND : 0;
414-
return request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring);
416+
ret = request_irq(ring->irq, ring_msix, irqflags, "thunderbolt", ring);
417+
if (ret)
418+
goto err_ida_remove;
419+
420+
return 0;
421+
422+
err_ida_remove:
423+
ida_simple_remove(&nhi->msix_ida, ring->vector);
424+
425+
return ret;
415426
}
416427

417428
static void ring_release_msix(struct tb_ring *ring)

0 commit comments

Comments
 (0)