From 012d070837fee6f7cc45207470cd6b4cc276c23d Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 14 May 2008 23:14:04 -0300 Subject: [PATCH] --- yaml --- r: 97716 b: refs/heads/master c: 81b8021a71c194752e8bbb29328cecc744a47b2b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/zoran_driver.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6da96505ddc9..20bb631b095f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: daf20d95bff81c6fc8a8d8160e620e1f9581af02 +refs/heads/master: 81b8021a71c194752e8bbb29328cecc744a47b2b diff --git a/trunk/drivers/media/video/zoran_driver.c b/trunk/drivers/media/video/zoran_driver.c index 345c77e46837..b75313d8c3a4 100644 --- a/trunk/drivers/media/video/zoran_driver.c +++ b/trunk/drivers/media/video/zoran_driver.c @@ -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); @@ -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); @@ -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);