Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1654bf2d authored by Jing Xiangfeng's avatar Jing Xiangfeng Committed by Greg Kroah-Hartman
Browse files

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



commit 7342ca34d931a357d408aaa25fadd031e46af137 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: default avatarJing Xiangfeng <jingxiangfeng@huawei.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06c1895f

drivers/thunderbolt/nhi.c

+15 −4
Original line number Diff line number Diff line
@@ -410,12 +410,23 @@ static int ring_request_msix(struct tb_ring *ring, bool no_suspend) 


	ring->vector = ret;



	ring->irq = pci_irq_vector(ring->nhi->pdev, ring->vector);

	if (ring->irq < 0)

		return ring->irq;

	ret = pci_irq_vector(ring->nhi->pdev, ring->vector);

	if (ret < 0)

		goto err_ida_remove;



	ring->irq = ret;



	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)