diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2011-06-18 04:13:55 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:53:33 -0400 |
commit | 98019f5e88ef912eb6fdbe5b23fed16c9ba230ee (patch) | |
tree | 2c23ef8bb6eb3122bef16baa6add2f8fb9b48c2c /Documentation/video4linux | |
parent | 71c6c4c918696625164ffdac4ece9f83bd4a6694 (diff) |
[media] v4l2-framework.txt: updated v4l2_fh_init documentation
v4l2_fh_init now returns void instead of int, updated the doc.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'Documentation/video4linux')
-rw-r--r-- | Documentation/video4linux/v4l2-framework.txt | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Documentation/video4linux/v4l2-framework.txt b/Documentation/video4linux/v4l2-framework.txt index cf21f7aae976..312a0e2f9d66 100644 --- a/Documentation/video4linux/v4l2-framework.txt +++ b/Documentation/video4linux/v4l2-framework.txt | |||
@@ -817,11 +817,7 @@ int my_open(struct file *file) | |||
817 | 817 | ||
818 | ... | 818 | ... |
819 | 819 | ||
820 | ret = v4l2_fh_init(&my_fh->fh, vfd); | 820 | v4l2_fh_init(&my_fh->fh, vfd); |
821 | if (ret) { | ||
822 | kfree(my_fh); | ||
823 | return ret; | ||
824 | } | ||
825 | 821 | ||
826 | ... | 822 | ... |
827 | 823 | ||
@@ -844,7 +840,7 @@ int my_release(struct file *file) | |||
844 | 840 | ||
845 | Below is a short description of the v4l2_fh functions used: | 841 | Below is a short description of the v4l2_fh functions used: |
846 | 842 | ||
847 | int v4l2_fh_init(struct v4l2_fh *fh, struct video_device *vdev) | 843 | void v4l2_fh_init(struct v4l2_fh *fh, struct video_device *vdev) |
848 | 844 | ||
849 | Initialise the file handle. This *MUST* be performed in the driver's | 845 | Initialise the file handle. This *MUST* be performed in the driver's |
850 | v4l2_file_operations->open() handler. | 846 | v4l2_file_operations->open() handler. |