Skip to content

Commit

Permalink
V4L/DVB (7901): zoran: use correct type for CPU flags
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew Morton authored and Mauro Carvalho Chehab committed Jun 5, 2008
1 parent daf20d9 commit 81b8021
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/media/video/zoran_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,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);
Expand Down Expand Up @@ -3436,7 +3436,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);
Expand Down Expand Up @@ -4375,7 +4375,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);
Expand Down

0 comments on commit 81b8021

Please sign in to comment.