From 94f0f02d4bb06b486011d1b642b857c1498a8fea Mon Sep 17 00:00:00 2001 From: Michael Hunold Date: Wed, 28 Apr 2004 16:31:39 +0000 Subject: - fix some ppc be endianess issues, overlay works fine, grabbing does not work reliably yet, though --- linux/drivers/media/common/saa7146_fops.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'linux/drivers/media/common/saa7146_fops.c') diff --git a/linux/drivers/media/common/saa7146_fops.c b/linux/drivers/media/common/saa7146_fops.c index fc5f4157d..329e6c436 100644 --- a/linux/drivers/media/common/saa7146_fops.c +++ b/linux/drivers/media/common/saa7146_fops.c @@ -88,10 +88,7 @@ int saa7146_buffer_queue(struct saa7146_dev *dev, #endif DEB_EE(("dev:%p, dmaq:%p, buf:%p\n", dev, q, buf)); - if( NULL == q ) { - ERR(("internal error: fatal NULL pointer for q.\n")); - return 0; - } + BUG_ON(!q); if (NULL == q->curr) { q->curr = buf; @@ -112,14 +109,11 @@ void saa7146_buffer_finish(struct saa7146_dev *dev, #if DEBUG_SPINLOCKS BUG_ON(!spin_is_locked(&dev->slock)); #endif - if( NULL == q->curr ) { - ERR(("internal error: fatal NULL pointer for q->curr.\n")); - return; - } - DEB_EE(("dev:%p, dmaq:%p, state:%d\n", dev, q, state)); DEB_EE(("q->curr:%p\n",q->curr)); + BUG_ON(!q->curr); + /* finish current buffer */ if (NULL == q->curr) { DEB_D(("aiii. no current buffer\n")); @@ -138,10 +132,7 @@ void saa7146_buffer_next(struct saa7146_dev *dev, { struct saa7146_buf *buf,*next = NULL; - if( NULL == q ) { - ERR(("internal error: fatal NULL pointer for q.\n")); - return; - } + BUG_ON(!q); DEB_INT(("dev:%p, dmaq:%p, vbi:%d\n", dev, q, vbi)); -- cgit v1.2.3