v4l2-dev.c: return 0 for NULL open and release callbacks
PATCH 1/2 v4l2-dev.c: return 0 for NULL open and release callbacks
Hello, all
This is two patches that removes empty open and release functions in pci/isa radio drivers. To handle that we change v4l2-dev.c file.
I'm not sure, but it's probably that small note about it should be added in docs. If i did something wrong, please correct.
---
From: Hans Verkuil <[email protected]>
Patch allows v4l2_open and v4l2_release functions return 0 if open and release driver callbacks set to NULL. This will be used in radio drivers.
Priority: normal
Signed-off-by Hans Verkuil <[email protected]>
Signed-off-by Alexey Klimov <[email protected]>
--
linux/drivers/media/video/v4l2-dev.c +8 -3
@@ -267,7 +267,7 @@static int v4l2_open (struct inode *inode,struct file *filp) {struct video_device *vdev; -int ret; +int ret =0 ;/* Check if the video device is available */ mutex_lock (&videodev_lock);
@@ -281,7 +281,9 @@/* and increase the device refcount */ video_get (vdev);mutex_unlock (&videodev_lock); - ret = vdev->fops->open (filp); +if (vdev->fops->open) + ret = vdev->fops->open (filp); +/* decrease the refcount in case of an error */ if (ret)video_put (vdev);
@@ -292,7 +294,10 @@static int v4l2_release (struct inode *inode,struct file *filp) {struct video_device *vdev =video_devdata (filp); -int ret = vdev->fops->release (filp); +int ret =0 ; + +if (vdev->fops->release) + vdev->fops->release (filp);/* decrease the refcount unconditionally since the release() return value is ignored. */
Signature · 1 line
Best regards, Klimov Alexey