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

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

[media] videobuf: fix sparse warnings 



videobuf-core.c:834:23: warning: Using plain integer as NULL pointer
videobuf-core.c:851:28: warning: Using plain integer as NULL pointer

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent cf38d4b9

drivers/media/v4l2-core/videobuf-core.c

+4 −2
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ MODULE_LICENSE("GPL"); 


#define CALL(q, f, arg...)						\

	((q->int_ops->f) ? q->int_ops->f(arg) : 0)

#define CALLPTR(q, f, arg...)						\

	((q->int_ops->f) ? q->int_ops->f(arg) : NULL)



struct videobuf_buffer *videobuf_alloc_vb(struct videobuf_queue *q)

{
@@ -831,7 +833,7 @@ static int __videobuf_copy_to_user(struct videobuf_queue *q, 
				   char __user *data, size_t count,

				   int nonblocking)

{

	void *vaddr = CALL(q, vaddr, buf);

	void *vaddr = CALLPTR(q, vaddr, buf);



	/* copy to userspace */

	if (count > buf->size - q->read_off)
@@ -848,7 +850,7 @@ static int __videobuf_copy_stream(struct videobuf_queue *q, 
				  char __user *data, size_t count, size_t pos,

				  int vbihack, int nonblocking)

{

	unsigned int *fc = CALL(q, vaddr, buf);

	unsigned int *fc = CALLPTR(q, vaddr, buf);



	if (vbihack) {

		/* dirty, undocumented hack -- pass the frame counter