---

yaml --- r: 29972 b: refs/heads/master c: d614402 h: refs/heads/master v: v3
git-mirror · Jun 25, 2006 · df4a822 · df4a822
1 parent 4fc61dc
commit df4a822
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0463f12c5cdc3d5577002826c302471b95b2532c
+refs/heads/master: d6144028af6b151018c50c160e794a4d7f686333
diff --git a/trunk/drivers/media/video/meye.c b/trunk/drivers/media/video/meye.c
@@ -1682,13 +1682,13 @@ static unsigned int meye_poll(struct file *file, poll_table *wait)
 
 static void meye_vm_open(struct vm_area_struct *vma)
 {
-	int idx = (int)vma->vm_private_data;
+	long idx = (long)vma->vm_private_data;
 	meye.vma_use_count[idx]++;
 }
 
 static void meye_vm_close(struct vm_area_struct *vma)
 {
-	int idx = (int)vma->vm_private_data;
+	long idx = (long)vma->vm_private_data;
 	meye.vma_use_count[idx]--;
 }
 

diff --git a/trunk/drivers/media/video/usbvideo/quickcam_messenger.c b/trunk/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -343,7 +343,7 @@ static int qcm_sensor_set_gains(struct uvd *uvd, u16 hue,
 	u16 saturation, u16 value)
 {
 	int ret;
-	u16 r,g,b;
+	u16 r=0,g=0,b=0;
 
 	/* this code is based on qc-usb-messenger */
 	qcm_hsv2rgb(hue, saturation, value, &r, &g, &b);

diff --git a/trunk/drivers/media/video/zoran_device.c b/trunk/drivers/media/video/zoran_device.c
@@ -536,7 +536,7 @@ zr36057_overlay (struct zoran *zr,
 		 * All error messages are internal driver checking only! */
 
 		/* video display top and bottom registers */
-		reg = (u32) zr->buffer.base +
+		reg = (long) zr->buffer.base +
 		    zr->overlay_settings.x *
 		    ((zr->overlay_settings.format->depth + 7) / 8) +
 		    zr->overlay_settings.y *