diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-14 21:58:45 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-14 21:58:45 -0600 |
| commit | 1895621dbd8ab81d0545392d3b9dc64a9f3b4593 (patch) | |
| tree | e3eb7ee9b5f9d8341a1c4b2c0dc5f135f59b6ef6 /linux/drivers/media/common | |
| parent | bb379778f6c9c6aa4dc340c342d5e81a0b9026dd (diff) | |
| parent | 49c7ae95a0e651f7e2186509d62e7eb21ff6154c (diff) | |
| download | mediapointer-dvb-s2-1895621dbd8ab81d0545392d3b9dc64a9f3b4593.tar.gz mediapointer-dvb-s2-1895621dbd8ab81d0545392d3b9dc64a9f3b4593.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/saa7146_core.c | 3 | ||||
| -rw-r--r-- | linux/drivers/media/common/saa7146_fops.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/linux/drivers/media/common/saa7146_core.c b/linux/drivers/media/common/saa7146_core.c index 71a5f1329..4233c2c2b 100644 --- a/linux/drivers/media/common/saa7146_core.c +++ b/linux/drivers/media/common/saa7146_core.c @@ -116,8 +116,7 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages) pg = vmalloc_to_page(virt); if (NULL == pg) goto err; - if (PageHighMem(pg)) - BUG(); + BUG_ON(PageHighMem(pg)); sglist[i].page = pg; sglist[i].length = PAGE_SIZE; } diff --git a/linux/drivers/media/common/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c index 480a34a26..fd9163d4b 100644 --- a/linux/drivers/media/common/saa7146_fops.c +++ b/linux/drivers/media/common/saa7146_fops.c @@ -38,8 +38,7 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits) struct saa7146_dev *dev = fh->dev; struct saa7146_vv *vv = dev->vv_data; - if ((fh->resources & bits) != bits) - BUG(); + BUG_ON((fh->resources & bits) != bits); mutex_lock(&dev->lock); fh->resources &= ~bits; @@ -56,8 +55,7 @@ void saa7146_dma_free(struct saa7146_dev *dev,struct saa7146_buf *buf) { DEB_EE(("dev:%p, buf:%p\n",dev,buf)); - if (in_interrupt()) - BUG(); + BUG_ON(in_interrupt()); videobuf_waiton(&buf->vb,0,0); videobuf_dma_pci_unmap(dev->pci, &buf->vb.dma); |