diff --git a/[refs] b/[refs]
index b97c1386016e..d6e7707f2ac3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26ee91efd941ea7fd40f6ee004f2f4d72f334564
+refs/heads/master: db1b72650d22b8ac3ce56aa90c4fe1314f1876cb
diff --git a/trunk/drivers/media/video/zoran/zoran_device.c b/trunk/drivers/media/video/zoran/zoran_device.c
index f6c2fb4fc3b4..d68da9f793c7 100644
--- a/trunk/drivers/media/video/zoran/zoran_device.c
+++ b/trunk/drivers/media/video/zoran/zoran_device.c
@@ -1196,7 +1196,8 @@ zoran_reap_stat_com (struct zoran *zr)
 static void zoran_restart(struct zoran *zr)
 {
 	/* Now the stat_comm buffer is ready for restart */
-	int status = 0, mode;
+	unsigned int status = 0;
+	int mode;
 
 	if (zr->codec_mode == BUZ_MODE_MOTION_COMPRESS) {
 		decoder_call(zr, video, g_input_status, &status);
diff --git a/trunk/drivers/media/video/zoran/zoran_driver.c b/trunk/drivers/media/video/zoran/zoran_driver.c
index 0d1e8710a322..ec41303544e5 100644
--- a/trunk/drivers/media/video/zoran/zoran_driver.c
+++ b/trunk/drivers/media/video/zoran/zoran_driver.c
@@ -1444,7 +1444,7 @@ zoran_set_norm (struct zoran *zr,
 	}
 
 	if (norm == V4L2_STD_ALL) {
-		int status = 0;
+		unsigned int status = 0;
 		v4l2_std_id std = 0;
 
 		decoder_call(zr, video, querystd, &std);