aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-29 19:19:38 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 20:44:30 -0400
commit65d9ff9c85d3c2e06d22aed78efee8404563eff6 (patch)
treede0492e5a6b73ed29222d924b7346b700cb40245 /drivers/media/video
parentdfa76fa2824967c0ec196fbcba36d3e74b66d3aa (diff)
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>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/v4l2-dev.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c
index 91228b3df07d..31eac66411d7 100644
--- a/drivers/media/video/v4l2-dev.c
+++ b/drivers/media/video/v4l2-dev.c
@@ -229,7 +229,7 @@ static int v4l2_mmap(struct file *filp, struct vm_area_struct *vm)
229static int v4l2_open(struct inode *inode, struct file *filp) 229static int v4l2_open(struct inode *inode, struct file *filp)
230{ 230{
231 struct video_device *vdev; 231 struct video_device *vdev;
232 int ret; 232 int ret = 0;
233 233
234 /* Check if the video device is available */ 234 /* Check if the video device is available */
235 mutex_lock(&videodev_lock); 235 mutex_lock(&videodev_lock);
@@ -243,7 +243,9 @@ static int v4l2_open(struct inode *inode, struct file *filp)
243 /* and increase the device refcount */ 243 /* and increase the device refcount */
244 video_get(vdev); 244 video_get(vdev);
245 mutex_unlock(&videodev_lock); 245 mutex_unlock(&videodev_lock);
246 ret = vdev->fops->open(filp); 246 if (vdev->fops->open)
247 ret = vdev->fops->open(filp);
248
247 /* decrease the refcount in case of an error */ 249 /* decrease the refcount in case of an error */
248 if (ret) 250 if (ret)
249 video_put(vdev); 251 video_put(vdev);
@@ -254,7 +256,10 @@ static int v4l2_open(struct inode *inode, struct file *filp)
254static int v4l2_release(struct inode *inode, struct file *filp) 256static int v4l2_release(struct inode *inode, struct file *filp)
255{ 257{
256 struct video_device *vdev = video_devdata(filp); 258 struct video_device *vdev = video_devdata(filp);
257 int ret = vdev->fops->release(filp); 259 int ret = 0;
260
261 if (vdev->fops->release)
262 vdev->fops->release(filp);
258 263
259 /* decrease the refcount unconditionally since the release() 264 /* decrease the refcount unconditionally since the release()
260 return value is ignored. */ 265 return value is ignored. */