aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAbylay Ospan <aospan@netup.ru>2015-09-25 04:56:21 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-10-22 15:48:26 -0200
commit9d2b064c0ae42ad93b2a0c7da05daef312c96bcc (patch)
tree27ca04ceb597ec5d3abccf8940666350ea2033eb
parent47810b4341ac9d2f558894bc5995e6fa2a1298f9 (diff)
downloadlinux-yocto-9d2b064c0ae42ad93b2a0c7da05daef312c96bcc.tar.gz
linux-yocto-9d2b064c0ae42ad93b2a0c7da05daef312c96bcc.tar.bz2
linux-yocto-9d2b064c0ae42ad93b2a0c7da05daef312c96bcc.zip
[media] netup_unidvb: fix potential crash when spi is NULL
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>
-rw-r--r--drivers/media/pci/netup_unidvb/netup_unidvb_spi.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c b/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
index f55b3276f28d..56773f3893d4 100644
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
@@ -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);