Commit 81b8021a authored by Andrew Morton's avatar Andrew Morton Committed by Mauro Carvalho Chehab

V4L/DVB (7901): zoran: use correct type for CPU flags

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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent daf20d95
...@@ -1167,7 +1167,7 @@ zoran_close_end_session (struct file *file) ...@@ -1167,7 +1167,7 @@ zoran_close_end_session (struct file *file)
/* v4l capture */ /* v4l capture */
if (fh->v4l_buffers.active != ZORAN_FREE) { if (fh->v4l_buffers.active != ZORAN_FREE) {
long flags; unsigned long flags;
spin_lock_irqsave(&zr->spinlock, flags); spin_lock_irqsave(&zr->spinlock, flags);
zr36057_set_memgrab(zr, 0); zr36057_set_memgrab(zr, 0);
...@@ -3436,7 +3436,7 @@ zoran_do_ioctl (struct inode *inode, ...@@ -3436,7 +3436,7 @@ zoran_do_ioctl (struct inode *inode,
/* unload capture */ /* unload capture */
if (zr->v4l_memgrab_active) { if (zr->v4l_memgrab_active) {
long flags; unsigned long flags;
spin_lock_irqsave(&zr->spinlock, flags); spin_lock_irqsave(&zr->spinlock, flags);
zr36057_set_memgrab(zr, 0); zr36057_set_memgrab(zr, 0);
...@@ -4375,7 +4375,7 @@ zoran_vm_close (struct vm_area_struct *vma) ...@@ -4375,7 +4375,7 @@ zoran_vm_close (struct vm_area_struct *vma)
mutex_lock(&zr->resource_lock); mutex_lock(&zr->resource_lock);
if (fh->v4l_buffers.active != ZORAN_FREE) { if (fh->v4l_buffers.active != ZORAN_FREE) {
long flags; unsigned long flags;
spin_lock_irqsave(&zr->spinlock, flags); spin_lock_irqsave(&zr->spinlock, flags);
zr36057_set_memgrab(zr, 0); zr36057_set_memgrab(zr, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment