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

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

[media] radio-timb: convert to unlocked_ioctl

parent 69756693
Loading
Loading
Loading
Loading
+4 −1
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ struct timbradio {
	struct v4l2_subdev	*sd_dsp;
	struct v4l2_subdev	*sd_dsp;
	struct video_device	video_dev;
	struct video_device	video_dev;
	struct v4l2_device	v4l2_dev;
	struct v4l2_device	v4l2_dev;
	struct mutex		lock;
};
};




@@ -142,7 +143,7 @@ static const struct v4l2_ioctl_ops timbradio_ioctl_ops = {


static const struct v4l2_file_operations timbradio_fops = {
static const struct v4l2_file_operations timbradio_fops = {
	.owner		= THIS_MODULE,
	.owner		= THIS_MODULE,
	.ioctl		= video_ioctl2,
	.unlocked_ioctl	= video_ioctl2,
};
};


static int __devinit timbradio_probe(struct platform_device *pdev)
static int __devinit timbradio_probe(struct platform_device *pdev)
@@ -164,6 +165,7 @@ static int __devinit timbradio_probe(struct platform_device *pdev)
	}
	}


	tr->pdata = *pdata;
	tr->pdata = *pdata;
	mutex_init(&tr->lock);


	strlcpy(tr->video_dev.name, "Timberdale Radio",
	strlcpy(tr->video_dev.name, "Timberdale Radio",
		sizeof(tr->video_dev.name));
		sizeof(tr->video_dev.name));
@@ -171,6 +173,7 @@ static int __devinit timbradio_probe(struct platform_device *pdev)
	tr->video_dev.ioctl_ops = &timbradio_ioctl_ops;
	tr->video_dev.ioctl_ops = &timbradio_ioctl_ops;
	tr->video_dev.release = video_device_release_empty;
	tr->video_dev.release = video_device_release_empty;
	tr->video_dev.minor = -1;
	tr->video_dev.minor = -1;
	tr->video_dev.lock = &tr->lock;


	strlcpy(tr->v4l2_dev.name, DRIVER_NAME, sizeof(tr->v4l2_dev.name));
	strlcpy(tr->v4l2_dev.name, DRIVER_NAME, sizeof(tr->v4l2_dev.name));
	err = v4l2_device_register(NULL, &tr->v4l2_dev);
	err = v4l2_device_register(NULL, &tr->v4l2_dev);