diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2008-06-28 16:14:00 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2008-06-28 16:14:00 -0400 |
| commit | 0e985540faf81db4b23e2cede9eb88aaa354a880 (patch) | |
| tree | 07b478faab050cb2740e49939f04d8881bf16e59 | |
| parent | 3930ab58c2dccf277e2026e760abcff5f22a7a0c (diff) | |
| parent | 4f2d17789141dd027ea033ac9a6f8b2922bf5a58 (diff) | |
| download | mediapointer-dvb-s2-0e985540faf81db4b23e2cede9eb88aaa354a880.tar.gz mediapointer-dvb-s2-0e985540faf81db4b23e2cede9eb88aaa354a880.tar.bz2 | |
merge: master
From: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
| -rw-r--r-- | linux/drivers/media/video/s2255drv.c | 18 | ||||
| -rwxr-xr-x | v4l/scripts/hghead.pl | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/linux/drivers/media/video/s2255drv.c b/linux/drivers/media/video/s2255drv.c index d9abde203..6d5fbad95 100644 --- a/linux/drivers/media/video/s2255drv.c +++ b/linux/drivers/media/video/s2255drv.c @@ -812,7 +812,7 @@ static int vidioc_querycap(struct file *file, void *priv, return 0; } -static int vidioc_enum_fmt_cap(struct file *file, void *priv, +static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv, struct v4l2_fmtdesc *f) { int index = 0; @@ -828,7 +828,7 @@ static int vidioc_enum_fmt_cap(struct file *file, void *priv, return 0; } -static int vidioc_g_fmt_cap(struct file *file, void *priv, +static int vidioc_g_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f) { struct s2255_fh *fh = priv; @@ -843,7 +843,7 @@ static int vidioc_g_fmt_cap(struct file *file, void *priv, return (0); } -static int vidioc_try_fmt_cap(struct file *file, void *priv, +static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f) { const struct s2255_fmt *fmt; @@ -949,7 +949,7 @@ static int vidioc_try_fmt_cap(struct file *file, void *priv, return 0; } -static int vidioc_s_fmt_cap(struct file *file, void *priv, +static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, struct v4l2_format *f) { struct s2255_fh *fh = priv; @@ -958,7 +958,7 @@ static int vidioc_s_fmt_cap(struct file *file, void *priv, int ret; int norm; - ret = vidioc_try_fmt_cap(file, fh, f); + ret = vidioc_try_fmt_vid_cap(file, fh, f); if (ret < 0) return (ret); @@ -1656,10 +1656,10 @@ static struct video_device template = { .minor = -1, .release = video_device_release, .vidioc_querycap = vidioc_querycap, - .vidioc_enum_fmt_cap = vidioc_enum_fmt_cap, - .vidioc_g_fmt_cap = vidioc_g_fmt_cap, - .vidioc_try_fmt_cap = vidioc_try_fmt_cap, - .vidioc_s_fmt_cap = vidioc_s_fmt_cap, + .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap, + .vidioc_g_fmt_vid_cap = vidioc_g_fmt_vid_cap, + .vidioc_try_fmt_vid_cap = vidioc_try_fmt_vid_cap, + .vidioc_s_fmt_vid_cap = vidioc_s_fmt_vid_cap, .vidioc_reqbufs = vidioc_reqbufs, .vidioc_querybuf = vidioc_querybuf, .vidioc_qbuf = vidioc_qbuf, diff --git a/v4l/scripts/hghead.pl b/v4l/scripts/hghead.pl index 14c3d906f..2450ad136 100755 --- a/v4l/scripts/hghead.pl +++ b/v4l/scripts/hghead.pl @@ -174,7 +174,8 @@ if ($from eq "") { die; } -if (!$maint_ok) { +if (!$maint_ok && $maintainer_name && $maintainer_email) { + print "#No maintainer's signature. Adding it.\n"; $signed=$signed."Signed-off-by: $maintainer_name <$maintainer_email>\n"; } |