From 10245ba858a39e94e4dc0d499664c43ff1345324 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 18 Jun 2011 05:13:55 -0300 Subject: [PATCH] --- yaml --- r: 261408 b: refs/heads/master c: 98019f5e88ef912eb6fdbe5b23fed16c9ba230ee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/video4linux/v4l2-framework.txt | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index f03c8c037179..912ac9f02e48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71c6c4c918696625164ffdac4ece9f83bd4a6694 +refs/heads/master: 98019f5e88ef912eb6fdbe5b23fed16c9ba230ee diff --git a/trunk/Documentation/video4linux/v4l2-framework.txt b/trunk/Documentation/video4linux/v4l2-framework.txt index cf21f7aae976..312a0e2f9d66 100644 --- a/trunk/Documentation/video4linux/v4l2-framework.txt +++ b/trunk/Documentation/video4linux/v4l2-framework.txt @@ -817,11 +817,7 @@ int my_open(struct file *file) ... - ret = v4l2_fh_init(&my_fh->fh, vfd); - if (ret) { - kfree(my_fh); - return ret; - } + v4l2_fh_init(&my_fh->fh, vfd); ... @@ -844,7 +840,7 @@ int my_release(struct file *file) Below is a short description of the v4l2_fh functions used: -int v4l2_fh_init(struct v4l2_fh *fh, struct video_device *vdev) +void v4l2_fh_init(struct v4l2_fh *fh, struct video_device *vdev) Initialise the file handle. This *MUST* be performed in the driver's v4l2_file_operations->open() handler.