V4L/DVB (11390): 2-dev.c: return 0 for NULL open and release callbacks
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. -- Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Alexey Klimov <klimov.linux@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
dfa76fa282
commit
65d9ff9c85
|
@ -229,7 +229,7 @@ static int v4l2_mmap(struct file *filp, struct vm_area_struct *vm)
|
|||
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);
|
||||
|
@ -243,7 +243,9 @@ static int v4l2_open(struct inode *inode, struct file *filp)
|
|||
/* 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);
|
||||
|
@ -254,7 +256,10 @@ static int v4l2_open(struct inode *inode, struct file *filp)
|
|||
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. */
|
||||
|
|
Loading…
Reference in a new issue