diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-04 14:35:16 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-04 14:35:16 -0300 |
| commit | e83e43ec4c4f80760289f0929e40bcffc7a0aeea (patch) | |
| tree | ab9f221287e70ac4af16a71b813c65970cd049f9 /linux/drivers/media/video/cx88 | |
| parent | 9ef7370d6ed40cac0780e41efd8a9b81e79219f8 (diff) | |
| parent | 0b0807ef7ebec0bda5074e9bb79aba86486ea728 (diff) | |
| download | mediapointer-dvb-s2-e83e43ec4c4f80760289f0929e40bcffc7a0aeea.tar.gz mediapointer-dvb-s2-e83e43ec4c4f80760289f0929e40bcffc7a0aeea.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/cx88')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-video.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c index c8870cf06..005a78aab 100644 --- a/linux/drivers/media/video/cx88/cx88-video.c +++ b/linux/drivers/media/video/cx88/cx88-video.c @@ -1514,15 +1514,12 @@ int cx88_enum_input (struct cx88_core *core,struct v4l2_input *i) [ CX88_VMUX_DVB ] = "DVB", [ CX88_VMUX_DEBUG ] = "for debug only", }; - unsigned int n; + unsigned int n = i->index; - n = i->index; if (n >= 4) return -EINVAL; if (0 == INPUT(n).type) return -EINVAL; - memset(i,0,sizeof(*i)); - i->index = n; i->type = V4L2_INPUT_TYPE_CAMERA; strcpy(i->name,iname[INPUT(n).type]); if ((CX88_VMUX_TELEVISION == INPUT(n).type) || @@ -1787,7 +1784,6 @@ static int radio_g_audio (struct file *file, void *priv, struct v4l2_audio *a) if (unlikely(a->index)) return -EINVAL; - memset(a,0,sizeof(*a)); strcpy(a->name,"Radio"); return 0; } |