From 52a197f27e5288d562aade0acd98f007fa20b8ed Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Mon, 26 Jun 2006 09:31:18 -0300
Subject: [PATCH] --- yaml --- r: 30849 b: refs/heads/master c:
 4d6b5aee9d19d1a982d9db0b5ffea20ee94816c6 h: refs/heads/master i:   30847:
 5f9a535cfe97cf2293f34ad4799b35451f6b9a06 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/cx2341x.c           | 2 +-
 trunk/drivers/media/video/saa7134/saa6752hs.c | 4 ++--
 trunk/include/media/cx2341x.h                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3ffe766e78a2..ec6db7c22cb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5b0142ad683a96d7c8d64cbdb95f255da8fd151
+refs/heads/master: 4d6b5aee9d19d1a982d9db0b5ffea20ee94816c6
diff --git a/trunk/drivers/media/video/cx2341x.c b/trunk/drivers/media/video/cx2341x.c
index 01b22eab5725..c98740979b60 100644
--- a/trunk/drivers/media/video/cx2341x.c
+++ b/trunk/drivers/media/video/cx2341x.c
@@ -601,7 +601,7 @@ static void cx2341x_calc_audio_properties(struct cx2341x_mpeg_params *params)
 }
 
 int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params,
-		  struct v4l2_ext_controls *ctrls, int cmd)
+		  struct v4l2_ext_controls *ctrls, unsigned int cmd)
 {
 	int err = 0;
 	int i;
diff --git a/trunk/drivers/media/video/saa7134/saa6752hs.c b/trunk/drivers/media/video/saa7134/saa6752hs.c
index de7b9e6e932a..afc8f352b8e7 100644
--- a/trunk/drivers/media/video/saa7134/saa6752hs.c
+++ b/trunk/drivers/media/video/saa7134/saa6752hs.c
@@ -432,10 +432,10 @@ static void saa6752hs_old_set_params(struct i2c_client* client,
 }
 
 static int handle_ctrl(struct saa6752hs_mpeg_params *params,
-		struct v4l2_ext_control *ctrl, int cmd)
+		struct v4l2_ext_control *ctrl, unsigned int cmd)
 {
 	int old = 0, new;
-	int set = cmd == VIDIOC_S_EXT_CTRLS;
+	int set = (cmd == VIDIOC_S_EXT_CTRLS);
 
 	new = ctrl->value;
 	switch (ctrl->id) {
diff --git a/trunk/include/media/cx2341x.h b/trunk/include/media/cx2341x.h
index 074c4008ad52..e1cbf79741be 100644
--- a/trunk/include/media/cx2341x.h
+++ b/trunk/include/media/cx2341x.h
@@ -89,7 +89,7 @@ int cx2341x_ctrl_query(struct cx2341x_mpeg_params *params,
 		struct v4l2_queryctrl *qctrl);
 const char **cx2341x_ctrl_get_menu(u32 id);
 int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params,
-		struct v4l2_ext_controls *ctrls, int cmd);
+		struct v4l2_ext_controls *ctrls, unsigned int cmd);
 void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p);
 void cx2341x_log_status(struct cx2341x_mpeg_params *p, int cardid);