git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial
[safe/jmp/linux-2.6]
/
drivers
/
media
/
common
/
saa7146_core.c
diff --git
a/drivers/media/common/saa7146_core.c
b/drivers/media/common/saa7146_core.c
index
7d04a6f
..
7707b8c
100644
(file)
--- a/
drivers/media/common/saa7146_core.c
+++ b/
drivers/media/common/saa7146_core.c
@@
-306,25
+306,22
@@
static irqreturn_t interrupt_hw(int irq, void *dev_id)
return IRQ_NONE;
}
return IRQ_NONE;
}
- if
( 0 != (dev->ext)
) {
- if
( 0 != (dev->ext->irq_mask & isr )
) {
- if
( 0 != dev->ext->irq_func ) {
+ if
(dev->ext
) {
+ if
(dev->ext->irq_mask & isr
) {
+ if
(dev->ext->irq_func)
dev->ext->irq_func(dev, &isr);
dev->ext->irq_func(dev, &isr);
- }
isr &= ~dev->ext->irq_mask;
}
}
if (0 != (isr & (MASK_27))) {
DEB_INT(("irq: RPS0 (0x%08x).\n",isr));
isr &= ~dev->ext->irq_mask;
}
}
if (0 != (isr & (MASK_27))) {
DEB_INT(("irq: RPS0 (0x%08x).\n",isr));
- if
( 0 != dev->vv_data && 0 != dev->vv_callback) {
+ if
(dev->vv_data && dev->vv_callback)
dev->vv_callback(dev,isr);
dev->vv_callback(dev,isr);
- }
isr &= ~MASK_27;
}
if (0 != (isr & (MASK_28))) {
isr &= ~MASK_27;
}
if (0 != (isr & (MASK_28))) {
- if
( 0 != dev->vv_data && 0 != dev->vv_callback) {
+ if
(dev->vv_data && dev->vv_callback)
dev->vv_callback(dev,isr);
dev->vv_callback(dev,isr);
- }
isr &= ~MASK_28;
}
if (0 != (isr & (MASK_16|MASK_17))) {
isr &= ~MASK_28;
}
if (0 != (isr & (MASK_16|MASK_17))) {
@@
-388,7
+385,7
@@
static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
}
dev->revision &= 0xf;
}
dev->revision &= 0xf;
- /* remap the memory from virtual to physical adress */
+ /* remap the memory from virtual to physical ad
d
ress */
err = pci_request_region(pci, 0, "saa7146");
if (err < 0)
err = pci_request_region(pci, 0, "saa7146");
if (err < 0)