Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d6b5aee authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (4257): Fix 64-bit compile warnings. 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent f5b0142a

drivers/media/video/cx2341x.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -601,7 +601,7 @@ static void cx2341x_calc_audio_properties(struct cx2341x_mpeg_params *params) 
}

}





int cx2341x_ext_ctrls(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 err = 0;

	int i;

	int i;

drivers/media/video/saa7134/saa6752hs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -432,10 +432,10 @@ static void saa6752hs_old_set_params(struct i2c_client* client, 
}

}





static int handle_ctrl(struct saa6752hs_mpeg_params *params,

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 old = 0, new;

	int set = cmd == VIDIOC_S_EXT_CTRLS;

	int set = (cmd == VIDIOC_S_EXT_CTRLS);





	new = ctrl->value;

	new = ctrl->value;

	switch (ctrl->id) {

	switch (ctrl->id) {

include/media/cx2341x.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ int cx2341x_ctrl_query(struct cx2341x_mpeg_params *params, 
		struct v4l2_queryctrl *qctrl);

		struct v4l2_queryctrl *qctrl);

const char **cx2341x_ctrl_get_menu(u32 id);

const char **cx2341x_ctrl_get_menu(u32 id);

int cx2341x_ext_ctrls(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);

void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p);

void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p);

void cx2341x_log_status(struct cx2341x_mpeg_params *p, int cardid);

void cx2341x_log_status(struct cx2341x_mpeg_params *p, int cardid);