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

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

V4L/DVB (6861): cx2341x: command argument should be u32 instead of int 



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

drivers/media/video/cx2341x.c

+1 −1
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ void cx2341x_fill_defaults(struct cx2341x_mpeg_params *p) 
EXPORT_SYMBOL(cx2341x_fill_defaults);



static int cx2341x_api(void *priv, cx2341x_mbox_func func,

		       int cmd, int args, ...)

		       u32 cmd, int args, ...)

{

	u32 data[CX2341X_MBOX_MAX_DATA];

	va_list vargs;

drivers/media/video/cx88/cx88-blackbird.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static int register_read(struct cx88_core *core, u32 address, u32 *value) 


/* ------------------------------------------------------------------ */



static int blackbird_mbox_func(void *priv, int command, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA])

static int blackbird_mbox_func(void *priv, u32 command, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA])

{

	struct cx8802_dev *dev = priv;

	unsigned long timeout;

drivers/media/video/ivtv/ivtv-mailbox.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ int ivtv_api(struct ivtv *itv, int cmd, int args, u32 data[]) 
	return (res == -EBUSY) ? ivtv_api_call(itv, cmd, args, data) : res;

}



int ivtv_api_func(void *priv, int cmd, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA])

int ivtv_api_func(void *priv, u32 cmd, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA])

{

	return ivtv_api(priv, cmd, in, data);

}

drivers/media/video/ivtv/ivtv-mailbox.h

+1 −1
Original line number Diff line number Diff line
@@ -28,6 +28,6 @@ void ivtv_api_get_data(struct ivtv_mailbox_data *mbox, int mb, u32 data[]); 
int ivtv_api(struct ivtv *itv, int cmd, int args, u32 data[]);

int ivtv_vapi_result(struct ivtv *itv, u32 data[CX2341X_MBOX_MAX_DATA], int cmd, int args, ...);

int ivtv_vapi(struct ivtv *itv, int cmd, int args, ...);

int ivtv_api_func(void *priv, int cmd, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA]);

int ivtv_api_func(void *priv, u32 cmd, int in, int out, u32 data[CX2341X_MBOX_MAX_DATA]);



#endif

drivers/media/video/pvrusb2/pvrusb2-encoder.c

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static int pvr2_encoder_read_words(struct pvr2_hdw *hdw, 
   cx2341x.ko to write to our encoder (by handing it a pointer to this

   function).  For earlier kernels this doesn't really matter. */

static int pvr2_encoder_cmd(void *ctxt,

			    int cmd,

			    u32 cmd,

			    int arg_cnt_send,

			    int arg_cnt_recv,

			    u32 *argp)