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

V4L/DVB (8791): v4l2-dev: do not clear the driver_data field 



The driver_data field of the device structure was zeroed, thus losing
this information. Many drivers set this up before calling
video_device_register, so we have to ensure that it isn't lost.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent c170ecf4

drivers/media/video/v4l2-dev.c

+4 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ int video_register_device_index(struct video_device *vfd, int type, int nr, 
	int end;

	int ret;

	char *name_base;

	void *priv = video_get_drvdata(vfd);



	/* the release callback MUST be present */

	BUG_ON(!vfd->release);
@@ -295,6 +296,9 @@ int video_register_device_index(struct video_device *vfd, int type, int nr, 


	/* sysfs class */

	memset(&vfd->dev, 0, sizeof(vfd->dev));

	/* The memset above cleared the device's drvdata, so

	   put back the copy we made earlier. */

	video_set_drvdata(vfd, priv);

	vfd->dev.class = &video_class;

	vfd->dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor);

	if (vfd->parent)