GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-07 23:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Signed-off-by: Abylay Ospan <aospan@netup.ru>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Abylay Ospan 2015-09-25 04:56:21 -03:00 • committed by Mauro Carvalho Chehab
parent 47810b4341
commit 9d2b064c0a
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
View file

@ -80,11 +80,9 @@ irqreturn_t netup_spi_interrupt(struct netup_spi *spi)
u16 reg; u16 reg;
unsigned long flags; unsigned long flags;
if (!spi) { if (!spi)
dev_dbg(&spi->master->dev,
"%s(): SPI not initialized\n", __func__);
return IRQ_NONE; return IRQ_NONE;
}
spin_lock_irqsave(&spi->lock, flags); spin_lock_irqsave(&spi->lock, flags);
reg = readw(&spi->regs->control_stat); reg = readw(&spi->regs->control_stat);
if (!(reg & NETUP_SPI_CTRL_IRQ)) { if (!(reg & NETUP_SPI_CTRL_IRQ)) {
@ -234,11 +232,9 @@ void netup_spi_release(struct netup_unidvb_dev *ndev)
unsigned long flags; unsigned long flags;
struct netup_spi *spi = ndev->spi; struct netup_spi *spi = ndev->spi;
if (!spi) { if (!spi)
dev_dbg(&spi->master->dev,
"%s(): SPI not initialized\n", __func__);
return; return;
}
spin_lock_irqsave(&spi->lock, flags); spin_lock_irqsave(&spi->lock, flags);
reg = readw(&spi->regs->control_stat); reg = readw(&spi->regs->control_stat);
writew(reg | NETUP_SPI_CTRL_IRQ, &spi->regs->control_stat); writew(reg | NETUP_SPI_CTRL_IRQ, &spi->regs->control_stat);