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/video/saa7134/saa7134-core.c | |
| 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/video/saa7134/saa7134-core.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index bd3c52e08..53717ff9c 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -321,8 +321,7 @@ void saa7134_pgtable_free(struct pci_dev *pci, struct saa7134_pgtable *pt) void saa7134_dma_free(struct saa7134_dev *dev,struct saa7134_buf *buf) { - if (in_interrupt()) - BUG(); + BUG_ON(in_interrupt()); videobuf_waiton(&buf->vb,0,0); videobuf_dma_pci_unmap(dev->pci, &buf->vb.dma); |