diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-25 01:07:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-25 01:07:17 -0300 |
| commit | 1012e50d3f53435f01b9af729ef23125eb4cc6e2 (patch) | |
| tree | 44233e4c0cc90db2e5c03083cbde03533d7755be /linux/drivers/media/common | |
| parent | e9af8370a92c5280ed2470c72b3a4dbbd1e3b9b2 (diff) | |
| parent | 09a7c4d4e9d8120b3ec951bb9ab3ae040da8ad94 (diff) | |
| download | mediapointer-dvb-s2-1012e50d3f53435f01b9af729ef23125eb4cc6e2.tar.gz mediapointer-dvb-s2-1012e50d3f53435f01b9af729ef23125eb4cc6e2.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
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 | 8 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_fops.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_vbi.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_video.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c index c36634248..c24723a67 100644 --- a/linux/drivers/media/common/saa7146_core.c +++ b/linux/drivers/media/common/saa7146_core.c @@ -310,9 +310,9 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id) return IRQ_NONE; } - if( 0 != (dev->ext)) { + if( NULL != (dev->ext)) { if( 0 != (dev->ext->irq_mask & isr )) { - if( 0 != dev->ext->irq_func ) { + if( NULL != dev->ext->irq_func ) { dev->ext->irq_func(dev, &isr); } isr &= ~dev->ext->irq_mask; @@ -320,13 +320,13 @@ static irqreturn_t interrupt_hw(int irq, void *dev_id) } if (0 != (isr & (MASK_27))) { DEB_INT(("irq: RPS0 (0x%08x).\n",isr)); - if( 0 != dev->vv_data && 0 != dev->vv_callback) { + if( NULL != dev->vv_data && NULL != dev->vv_callback) { dev->vv_callback(dev,isr); } isr &= ~MASK_27; } if (0 != (isr & (MASK_28))) { - if( 0 != dev->vv_data && 0 != dev->vv_callback) { + if( NULL != dev->vv_data && NULL != dev->vv_callback) { dev->vv_callback(dev,isr); } isr &= ~MASK_28; diff --git a/linux/drivers/media/common/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c index 772b842bf..fee81488f 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 != 0 && result != 0 ) { + if( fh != NULL && result != 0 ) { kfree(fh); file->private_data = NULL; } diff --git a/linux/drivers/media/common/saa7146_vbi.c b/linux/drivers/media/common/saa7146_vbi.c index 50cb69e9d..9a03df7fc 100644 --- a/linux/drivers/media/common/saa7146_vbi.c +++ b/linux/drivers/media/common/saa7146_vbi.c @@ -408,8 +408,8 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file) fh->vbi_fmt.start[1] = 312; fh->vbi_fmt.count[1] = 16; - videobuf_queue_pci_init(&fh->vbi_q, &vbi_qops, - dev->pci, &dev->slock, + videobuf_queue_sg_init(&fh->vbi_q, &vbi_qops, + &dev->pci->dev, &dev->slock, V4L2_BUF_TYPE_VBI_CAPTURE, V4L2_FIELD_SEQ_TB, // FIXME: does this really work? sizeof(struct saa7146_buf), diff --git a/linux/drivers/media/common/saa7146_video.c b/linux/drivers/media/common/saa7146_video.c index 027d62c04..b68c6288b 100644 --- a/linux/drivers/media/common/saa7146_video.c +++ b/linux/drivers/media/common/saa7146_video.c @@ -1411,8 +1411,8 @@ static int video_open(struct saa7146_dev *dev, struct file *file) sfmt = format_by_fourcc(dev,fh->video_fmt.pixelformat); fh->video_fmt.sizeimage = (fh->video_fmt.width * fh->video_fmt.height * sfmt->depth)/8; - videobuf_queue_pci_init(&fh->video_q, &video_qops, - dev->pci, &dev->slock, + videobuf_queue_sg_init(&fh->video_q, &video_qops, + &dev->pci->dev, &dev->slock, V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_INTERLACED, sizeof(struct saa7146_buf), |