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

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

V4L/DVB (5905): ivtv-fb: Use proper ioctl value 



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

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

+3 −3
Original line number Diff line number Diff line
@@ -424,10 +424,10 @@ static int ivtvfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar 
			finish_wait(&itv->vsync_waitq, &wait);

			return rc;



		case IVTVFB_IOCTL_PREP_FRAME: {

			struct ivtvfb_ioctl_dma_host_to_ivtv_args args;

		case IVTVFB_IOC_DMA_FRAME: {

			struct ivtvfb_dma_frame args;



			IVTV_FB_DEBUG_INFO("IVTVFB_IOCTL_PREP_FRAME\n");

			IVTV_FB_DEBUG_INFO("IVTVFB_IOC_DMA_FRAME\n");

			if (copy_from_user(&args, (void __user *)arg, sizeof(args)))

				return -EFAULT;

include/media/ivtv-fb.h

+2 −3
Original line number Diff line number Diff line
@@ -23,13 +23,12 @@ 


/* Framebuffer external API */



struct ivtvfb_ioctl_dma_host_to_ivtv_args {

struct ivtvfb_dma_frame {

	void __user *source;

	unsigned long dest_offset;

	int count;

};



/* Framebuffer ioctls should use the range 1 - 28 */

#define IVTVFB_IOCTL_PREP_FRAME         _IOW('@', 3, struct ivtvfb_ioctl_dma_host_to_ivtv_args)

#define IVTVFB_IOC_DMA_FRAME  _IOW ('V', BASE_VIDIOC_PRIVATE+0, struct ivtvfb_dma_frame)



#endif