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

Commit 9d2b064c authored by Abylay Ospan's avatar Abylay Ospan Committed by Mauro Carvalho Chehab
Browse files

[media] netup_unidvb: fix potential crash when spi is NULL 



Signed-off-by: default avatarAbylay Ospan <aospan@netup.ru>
Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 47810b43

drivers/media/pci/netup_unidvb/netup_unidvb_spi.c

+4 −8
Original line number Diff line number Diff line
@@ -80,11 +80,9 @@ irqreturn_t netup_spi_interrupt(struct netup_spi *spi) 
	u16 reg;

	unsigned long flags;



	if (!spi) {

		dev_dbg(&spi->master->dev,

			"%s(): SPI not initialized\n", __func__);

	if (!spi)

		return IRQ_NONE;

	}



	spin_lock_irqsave(&spi->lock, flags);

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

	if (!(reg & NETUP_SPI_CTRL_IRQ)) {
@@ -234,11 +232,9 @@ void netup_spi_release(struct netup_unidvb_dev *ndev) 
	unsigned long flags;

	struct netup_spi *spi = ndev->spi;



	if (!spi) {

		dev_dbg(&spi->master->dev,

			"%s(): SPI not initialized\n", __func__);

	if (!spi)

		return;

	}



	spin_lock_irqsave(&spi->lock, flags);

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

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