Unverified Commit e297ddf2 authored by Lukas Wunner's avatar Lukas Wunner Committed by Mark Brown
Browse files

media: netup_unidvb: Don't leak SPI master in probe error path 



If the call to spi_register_master() fails on probe of the NetUP
Universal DVB driver, the spi_master struct is erroneously not freed.

Likewise, if spi_new_device() fails, the spi_controller struct is
not unregistered.  Plug the leaks.

While at it, fix an ordering issue in netup_spi_release() wherein
spi_unregister_master() is called after fiddling with the IRQ control
register.  The correct order is to call spi_unregister_master() *before*
this teardown step because bus accesses may still be ongoing until that
function returns.

Fixes: 52b1eaf4 ("[media] netup_unidvb: NetUP Universal DVB-S/S2/T/T2/C PCI-E card driver")
Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Cc: <stable@vger.kernel.org> # v4.3+: 5e844cc3: spi: Introduce device-managed SPI controller allocation
Cc: <stable@vger.kernel.org> # v4.3+
Cc: Kozlov Sergey <serjk@netup.ru>
Link: https://lore.kernel.org/r/c4c24f333fc7840f4a3db24789e6e10dd660bede.1607286887.git.lukas@wunner.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5b8c8846

drivers/media/pci/netup_unidvb/netup_unidvb_spi.c

+3 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ int netup_spi_init(struct netup_unidvb_dev *ndev) 
	struct spi_master *master;

	struct netup_spi *nspi;



	master = spi_alloc_master(&ndev->pci_dev->dev,

	master = devm_spi_alloc_master(&ndev->pci_dev->dev,

		sizeof(struct netup_spi));

	if (!master) {

		dev_err(&ndev->pci_dev->dev,
@@ -208,6 +208,7 @@ int netup_spi_init(struct netup_unidvb_dev *ndev) 
		ndev->pci_slot,

		ndev->pci_func);

	if (!spi_new_device(master, &netup_spi_board)) {

		spi_unregister_master(master);

		ndev->spi = NULL;

		dev_err(&ndev->pci_dev->dev,

			"%s(): unable to create SPI device\n", __func__);
@@ -226,13 +227,13 @@ void netup_spi_release(struct netup_unidvb_dev *ndev) 
	if (!spi)

		return;



	spi_unregister_master(spi->master);

	spin_lock_irqsave(&spi->lock, flags);

	reg = readw(&spi->regs->control_stat);

	writew(reg | NETUP_SPI_CTRL_IRQ, &spi->regs->control_stat);

	reg = readw(&spi->regs->control_stat);

	writew(reg & ~NETUP_SPI_CTRL_IMASK, &spi->regs->control_stat);

	spin_unlock_irqrestore(&spi->lock, flags);

	spi_unregister_master(spi->master);

	ndev->spi = NULL;

}