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

Commit 08b99e26 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] vb2 core: Fix a few printk warnings 



drivers/media/video/videobuf2-core.c: In function ‘__vb2_perform_fileio’:
drivers/media/video/videobuf2-core.c:1638: warning: format ‘%ld’ expects type ‘long int’, but argument 4 has type ‘size_t’
drivers/media/video/videobuf2-core.c:1697: warning: format ‘%ld’ expects type ‘long int’, but argument 2 has type ‘size_t’
drivers/media/video/videobuf2-core.c:1703: warning: format ‘%ld’ expects type ‘long int’, but argument 2 has type ‘size_t’

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b25748fe

drivers/media/video/videobuf2-core.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1635,7 +1635,7 @@ static size_t __vb2_perform_fileio(struct vb2_queue *q, char __user *data, size_ 
	struct vb2_fileio_buf *buf;

	struct vb2_fileio_buf *buf;

	int ret, index;

	int ret, index;





	dprintk(3, "file io: mode %s, offset %ld, count %ld, %sblocking\n",

	dprintk(3, "file io: mode %s, offset %ld, count %zd, %sblocking\n",

		read ? "read" : "write", (long)*ppos, count,

		read ? "read" : "write", (long)*ppos, count,

		nonblock ? "non" : "");

		nonblock ? "non" : "");
@@ -1694,13 +1694,13 @@ static size_t __vb2_perform_fileio(struct vb2_queue *q, char __user *data, size_ 
	 */

	 */

	if (buf->pos + count > buf->size) {

	if (buf->pos + count > buf->size) {

		count = buf->size - buf->pos;

		count = buf->size - buf->pos;

		dprintk(5, "reducing read count: %ld\n", count);

		dprintk(5, "reducing read count: %zd\n", count);

	}

	}





	/*

	/*

	 * Transfer data to userspace.

	 * Transfer data to userspace.

	 */

	 */

	dprintk(3, "file io: copying %ld bytes - buffer %d, offset %u\n",

	dprintk(3, "file io: copying %zd bytes - buffer %d, offset %u\n",

		count, index, buf->pos);

		count, index, buf->pos);

	if (read)

	if (read)

		ret = copy_to_user(data, buf->vaddr + buf->pos, count);

		ret = copy_to_user(data, buf->vaddr + buf->pos, count);