diff options
| author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-13 11:17:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 11:53:19 -0500 |
| commit | ae24601b47c3f4a56545ef4cd4e7c821ac1db598 (patch) | |
| tree | 562258e9fdec32a9b7410a8467dc5315bdbfe8c3 /drivers/media/common/saa7146_fops.c | |
| parent | 9d9d6baeca6f9174b8e7fd219a62a8fa09d61cc7 (diff) | |
V4L/DVB (3485): BUG_ON() Conversion in drivers/video/media
Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/common/saa7146_fops.c')
| -rw-r--r-- | drivers/media/common/saa7146_fops.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c index dc7fb20f47b..3870fa948cc 100644 --- a/drivers/media/common/saa7146_fops.c +++ b/drivers/media/common/saa7146_fops.c | |||
| @@ -37,8 +37,7 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits) | |||
| 37 | struct saa7146_dev *dev = fh->dev; | 37 | struct saa7146_dev *dev = fh->dev; |
| 38 | struct saa7146_vv *vv = dev->vv_data; | 38 | struct saa7146_vv *vv = dev->vv_data; |
| 39 | 39 | ||
| 40 | if ((fh->resources & bits) != bits) | 40 | BUG_ON((fh->resources & bits) != bits); |
| 41 | BUG(); | ||
| 42 | 41 | ||
| 43 | mutex_lock(&dev->lock); | 42 | mutex_lock(&dev->lock); |
| 44 | fh->resources &= ~bits; | 43 | fh->resources &= ~bits; |
| @@ -55,8 +54,7 @@ void saa7146_dma_free(struct saa7146_dev *dev,struct saa7146_buf *buf) | |||
| 55 | { | 54 | { |
| 56 | DEB_EE(("dev:%p, buf:%p\n",dev,buf)); | 55 | DEB_EE(("dev:%p, buf:%p\n",dev,buf)); |
| 57 | 56 | ||
| 58 | if (in_interrupt()) | 57 | BUG_ON(in_interrupt()); |
| 59 | BUG(); | ||
| 60 | 58 | ||
| 61 | videobuf_waiton(&buf->vb,0,0); | 59 | videobuf_waiton(&buf->vb,0,0); |
| 62 | videobuf_dma_pci_unmap(dev->pci, &buf->vb.dma); | 60 | videobuf_dma_pci_unmap(dev->pci, &buf->vb.dma); |