projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
V4L/DVB (3485): BUG_ON() Conversion in drivers/video/media
[linux-2.6-microblaze.git]
/
drivers
/
media
/
video
/
cx88
/
cx88-core.c
diff --git
a/drivers/media/video/cx88/cx88-core.c
b/drivers/media/video/cx88/cx88-core.c
index
25be3a9
..
c2cdbaf
100644
(file)
--- a/
drivers/media/video/cx88/cx88-core.c
+++ b/
drivers/media/video/cx88/cx88-core.c
@@
-215,8
+215,7
@@
int cx88_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
void
cx88_free_buffer(struct pci_dev *pci, struct cx88_buffer *buf)
{
- if (in_interrupt())
- BUG();
+ BUG_ON(in_interrupt());
videobuf_waiton(&buf->vb,0,0);
videobuf_dma_pci_unmap(pci, &buf->vb.dma);
videobuf_dma_free(&buf->vb.dma);