diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-14 23:14:04 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-14 23:14:04 +0000 |
| commit | e8af083c78cec1b0711b71093bf7a2837e7113f9 (patch) | |
| tree | 05c9d1dab89e66355c1fb939a5474a6625b2d627 /linux/drivers/media/video/zoran_driver.c | |
| parent | ff9096bbd55f8b8c208aa367374abc7951145491 (diff) | |
| download | mediapointer-dvb-s2-e8af083c78cec1b0711b71093bf7a2837e7113f9.tar.gz mediapointer-dvb-s2-e8af083c78cec1b0711b71093bf7a2837e7113f9.tar.bz2 | |
zoran: use correct type for CPU flags
From: Andrew Morton <akpm@linux-foundation.org>
locking-add-typecheck-on-irqsave-and-friends-for-correct-flags.patch will cause
drivers/media/video/zoran_driver.c: In function 'zoran_close_end_session':
drivers/media/video/zoran_driver.c:1172: warning: comparison of distinct pointer types lacks a cast
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/zoran_driver.c')
| -rw-r--r-- | linux/drivers/media/video/zoran_driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/zoran_driver.c b/linux/drivers/media/video/zoran_driver.c index 6b7a7c137..0949c53f0 100644 --- a/linux/drivers/media/video/zoran_driver.c +++ b/linux/drivers/media/video/zoran_driver.c @@ -1234,7 +1234,7 @@ zoran_close_end_session (struct file *file) /* v4l capture */ if (fh->v4l_buffers.active != ZORAN_FREE) { - long flags; + unsigned long flags; spin_lock_irqsave(&zr->spinlock, flags); zr36057_set_memgrab(zr, 0); @@ -3503,7 +3503,7 @@ zoran_do_ioctl (struct inode *inode, /* unload capture */ if (zr->v4l_memgrab_active) { - long flags; + unsigned long flags; spin_lock_irqsave(&zr->spinlock, flags); zr36057_set_memgrab(zr, 0); @@ -4442,7 +4442,7 @@ zoran_vm_close (struct vm_area_struct *vma) mutex_lock(&zr->resource_lock); if (fh->v4l_buffers.active != ZORAN_FREE) { - long flags; + unsigned long flags; spin_lock_irqsave(&zr->spinlock, flags); zr36057_set_memgrab(zr, 0); |