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

Commit a9e11134 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (8253): gspca: fix warnings on x86_64 



/home/v4l/master/v4l/gspca.c: In function 'gspca_frame_add':
/home/v4l/master/v4l/gspca.c:222: warning: format '%d' expects type 'int', but argument 2 has type 'long int'
/home/v4l/master/v4l/gspca.c: In function 'dev_read':
/home/v4l/master/v4l/gspca.c:1568: warning: format '%d' expects type 'int', but argument 2 has type 'size_t'
/home/v4l/master/v4l/gspca.c:1618: warning: format '%d' expects type 'int', but argument 3 has type 'size_t'

Acked-by: default avatarJean-Francois Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent a47cacbd

drivers/media/video/gspca/gspca.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -216,7 +216,7 @@ struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev, 
	if (len > 0) {

	if (len > 0) {

		if (frame->data_end - frame->data + len

		if (frame->data_end - frame->data + len

						 > frame->v4l2_buf.length) {

						 > frame->v4l2_buf.length) {

			PDEBUG(D_ERR|D_PACK, "frame overflow %d > %d",

			PDEBUG(D_ERR|D_PACK, "frame overflow %zd > %d",

				frame->data_end - frame->data + len,

				frame->data_end - frame->data + len,

				frame->v4l2_buf.length);

				frame->v4l2_buf.length);

			packet_type = DISCARD_PACKET;

			packet_type = DISCARD_PACKET;
@@ -1562,7 +1562,7 @@ static ssize_t dev_read(struct file *file, char __user *data, 
	struct timeval timestamp;

	struct timeval timestamp;

	int n, ret, ret2;

	int n, ret, ret2;





	PDEBUG(D_FRAM, "read (%d)", count);

	PDEBUG(D_FRAM, "read (%zd)", count);

	if (!gspca_dev->present)

	if (!gspca_dev->present)

		return -ENODEV;

		return -ENODEV;

	switch (gspca_dev->memory) {

	switch (gspca_dev->memory) {
@@ -1613,7 +1613,7 @@ static ssize_t dev_read(struct file *file, char __user *data, 
	ret = copy_to_user(data, frame->data, count);

	ret = copy_to_user(data, frame->data, count);

	if (ret != 0) {

	if (ret != 0) {

		PDEBUG(D_ERR|D_STREAM,

		PDEBUG(D_ERR|D_STREAM,

			"read cp to user lack %d / %d", ret, count);

			"read cp to user lack %d / %zd", ret, count);

		ret = -EFAULT;

		ret = -EFAULT;

		goto out;

		goto out;

	}

	}