From 14a9ccf9e20749d758abb6db6dce282d527c8ca6 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 23 Aug 2008 06:38:11 -0300 Subject: [PATCH] --- yaml --- r: 113866 b: refs/heads/master c: e138c592b50370621653fd962b2bc3f4e25dfe78 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/media/v4l2-dev.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 477db4c424e7..7c6a4fc84189 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6e7497eaf9889d39a070f60309a9bcea1fd29f6 +refs/heads/master: e138c592b50370621653fd962b2bc3f4e25dfe78 diff --git a/trunk/include/media/v4l2-dev.h b/trunk/include/media/v4l2-dev.h index 30855077be44..23df00919ae8 100644 --- a/trunk/include/media/v4l2-dev.h +++ b/trunk/include/media/v4l2-dev.h @@ -83,14 +83,14 @@ struct video_device #define to_video_device(cd) container_of(cd, struct video_device, dev) /* Version 2 functions */ -extern int video_register_device(struct video_device *vfd, int type, int nr); -int video_register_device_index(struct video_device *vfd, int type, int nr, +int __must_check video_register_device(struct video_device *vfd, int type, int nr); +int __must_check video_register_device_index(struct video_device *vfd, int type, int nr, int index); void video_unregister_device(struct video_device *); /* helper functions to alloc / release struct video_device, the later can be used for video_device->release() */ -struct video_device *video_device_alloc(void); +struct video_device * __must_check video_device_alloc(void); /* this release function frees the vfd pointer */ void video_device_release(struct video_device *vfd); /* this release function does nothing, use when the video_device is a