V4L/DVB (10138): v4l2-ioctl: change to long return type to match unlocked_ioctl.

[safe/jmp/linux-2.6] / drivers / media / video / tea6415c.c

diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c
index 31dde86..7519fd1 100644 (file)
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
@@ -122,7 +122,7 @@ static int switch_matrix(struct i2c_client *client, int i, int o)
        return ret;
 }
 
-static int tea6415c_ioctl(struct v4l2_subdev *sd, unsigned cmd, void *arg)
+static long tea6415c_ioctl(struct v4l2_subdev *sd, unsigned cmd, void *arg)
 {
        if (cmd == TEA6415C_SWITCH) {
                struct i2c_client *client = v4l2_get_subdevdata(sd);