diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-15 00:30:28 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-15 00:30:28 -0300 |
| commit | 026810eff5e52b99a11e71acd0f56c13b4e41207 (patch) | |
| tree | d650a9544fc5b4d788f00b77c5bf8e7e7a690634 /linux/drivers/media/common | |
| parent | aad022d99cb9a72d6857c4bef808a52cdcb3e824 (diff) | |
| download | mediapointer-dvb-s2-026810eff5e52b99a11e71acd0f56c13b4e41207.tar.gz mediapointer-dvb-s2-026810eff5e52b99a11e71acd0f56c13b4e41207.tar.bz2 | |
Backport changeset 5fa1247a2b56f33f88432c24e109deaf91ef8281
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Original patch from Al Viro <viro@ftp.linux.org.uk>
Date: Sat Mar 29 03:07:38 2008 +0000
NULL noise: drivers/media
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/saa7146_core.c | 13 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_fops.c | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c index 67b7dbc81..973989dd4 100644 --- a/linux/drivers/media/common/saa7146_core.c +++ b/linux/drivers/media/common/saa7146_core.c @@ -310,25 +310,22 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id) return IRQ_NONE; } - if( NULL != (dev->ext)) { - if( 0 != (dev->ext->irq_mask & isr )) { - if( NULL != dev->ext->irq_func ) { + if (dev->ext) { + if (dev->ext->irq_mask & isr) { + if (dev->ext->irq_func) dev->ext->irq_func(dev, &isr); - } isr &= ~dev->ext->irq_mask; } } if (0 != (isr & (MASK_27))) { DEB_INT(("irq: RPS0 (0x%08x).\n",isr)); - if( NULL != dev->vv_data && NULL != dev->vv_callback) { + if (dev->vv_data && dev->vv_callback) dev->vv_callback(dev,isr); - } isr &= ~MASK_27; } if (0 != (isr & (MASK_28))) { - if( NULL != dev->vv_data && NULL != dev->vv_callback) { + if (dev->vv_data && dev->vv_callback) dev->vv_callback(dev,isr); - } isr &= ~MASK_28; } if (0 != (isr & (MASK_16|MASK_17))) { diff --git a/linux/drivers/media/common/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c index fee81488f..ac035cbcf 100644 --- a/linux/drivers/media/common/saa7146_fops.c +++ b/linux/drivers/media/common/saa7146_fops.c @@ -273,7 +273,7 @@ static int fops_open(struct inode *inode, struct file *file) result = 0; out: - if( fh != NULL && result != 0 ) { + if (fh && result != 0) { kfree(fh); file->private_data = NULL; } |