diff options
| author | Johannes Stezenbach <devnull@localhost> | 2004-07-31 00:05:45 +0000 |
|---|---|---|
| committer | Johannes Stezenbach <devnull@localhost> | 2004-07-31 00:05:45 +0000 |
| commit | d3c7341869a8188aff16975a785c4c5d05c3fcb8 (patch) | |
| tree | d0fa6a77187580a4ff427ed50608a2490f245cda /linux/drivers/media/dvb/ttpci/av7110.c | |
| parent | 12994bfc905a0bb9f5ba354f7d11278d39dbc26b (diff) | |
| download | mediapointer-dvb-s2-d3c7341869a8188aff16975a785c4c5d05c3fcb8.tar.gz mediapointer-dvb-s2-d3c7341869a8188aff16975a785c4c5d05c3fcb8.tar.bz2 | |
merge back various cleanups from mainline kernel:
- sparse annotiations (viro)
- NULL noise removal (viro)
- #if where #ifdef should've been (saa7146) (viro)
- convert private ABS() to kernel's abs() (rddunlap)
- dvb_register_i2c_device() locking fix for -ENOMEM (akpm)
- dvb_register_i2c_bus() locking fix for -ENOMEM (akpm)
Diffstat (limited to 'linux/drivers/media/dvb/ttpci/av7110.c')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index f8a34b67c..e3e7105b7 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -389,7 +389,7 @@ static void debiirq (unsigned long data) case DATA_PIPING: if (av7110->handle2filter[handle]) DvbDmxFilterCallback((u8 *)av7110->debi_virt, - av7110->debilen, 0, 0, + av7110->debilen, NULL, 0, av7110->handle2filter[handle], DMX_OK, av7110); spin_lock(&av7110->debilock); @@ -722,7 +722,7 @@ static struct file_operations dvb_osd_fops = { }; static struct dvb_device dvbdev_osd = { - .priv = 0, + .priv = NULL, .users = 1, .writers = 1, .fops = &dvb_osd_fops, @@ -999,7 +999,7 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed) !demux->pesfilter[feed->pes_type]) return -EINVAL; demux->pids[feed->pes_type] |= 0x8000; - demux->pesfilter[feed->pes_type] = 0; + demux->pesfilter[feed->pes_type] = NULL; } if (feed->ts_type & TS_DECODER && feed->pes_type < DMX_TS_PES_OTHER) { @@ -1526,7 +1526,7 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d /* ARM "watchdog" */ init_waitqueue_head(&av7110->arm_wait); - av7110->arm_thread = 0; + av7110->arm_thread = NULL; /* allocate and init buffers */ av7110->debi_virt = pci_alloc_consistent(dev->pci, 8192, |