diff options
| author | Gerd Knorr <devnull@localhost> | 2005-02-15 15:59:34 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2005-02-15 15:59:34 +0000 |
| commit | 7d4651c8e0961354b298165ec03219c02bc7c734 (patch) | |
| tree | f5288a3b033c9d07e9963080023e045b567aeb6e /linux/drivers/media/video/saa7134/saa7134-core.c | |
| parent | b57159d1bd8754b2845b558cf778e9698bb0fc71 (diff) | |
| download | mediapointer-dvb-s2-7d4651c8e0961354b298165ec03219c02bc7c734.tar.gz mediapointer-dvb-s2-7d4651c8e0961354b298165ec03219c02bc7c734.tar.bz2 | |
- merge some patches from mainline.
- tuner kernel message fixups.
- misc.
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-core.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index cefb39d59..a639cc90a 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-core.c,v 1.25 2005/01/31 11:32:47 kraxel Exp $ + * $Id: saa7134-core.c,v 1.26 2005/02/15 15:59:35 kraxel Exp $ * * device driver for philips saa7134 based TV cards * driver core @@ -383,10 +383,8 @@ int saa7134_buffer_queue(struct saa7134_dev *dev, struct saa7134_buf *buf) { struct saa7134_buf *next = NULL; -#ifdef DEBUG_SPINLOCKS - BUG_ON(!spin_is_locked(&dev->slock)); -#endif + assert_spin_locked(&dev->slock); dprintk("buffer_queue %p\n",buf); if (NULL == q->curr) { if (!q->need_two) { @@ -412,9 +410,7 @@ void saa7134_buffer_finish(struct saa7134_dev *dev, struct saa7134_dmaqueue *q, unsigned int state) { -#ifdef DEBUG_SPINLOCKS - BUG_ON(!spin_is_locked(&dev->slock)); -#endif + assert_spin_locked(&dev->slock); dprintk("buffer_finish %p\n",q->curr); /* finish current buffer */ @@ -429,9 +425,7 @@ void saa7134_buffer_next(struct saa7134_dev *dev, { struct saa7134_buf *buf,*next = NULL; -#ifdef DEBUG_SPINLOCKS - BUG_ON(!spin_is_locked(&dev->slock)); -#endif + assert_spin_locked(&dev->slock); BUG_ON(NULL != q->curr); if (!list_empty(&q->queue)) { @@ -486,9 +480,7 @@ int saa7134_set_dmabits(struct saa7134_dev *dev) enum v4l2_field cap = V4L2_FIELD_ANY; enum v4l2_field ov = V4L2_FIELD_ANY; -#ifdef DEBUG_SPINLOCKS - BUG_ON(!spin_is_locked(&dev->slock)); -#endif + assert_spin_locked(&dev->slock); /* video capture -- dma 0 + video task A */ if (dev->video_q.curr) { |