Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / drivers / media / video / saa7134 / saa6752hs.c

diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index de7b9e6e932a9b70aec1e53e2ff5d3ff985369c9..57f1f5d409e0e0f3f11b1b046c4672f57edd16c8 100644 (file)
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -1,6 +1,5 @@
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/delay.h>
@@ -432,10 +431,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) {