diff options
Diffstat (limited to 'drivers/media/video/cx18/cx18-streams.c')
-rw-r--r-- | drivers/media/video/cx18/cx18-streams.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/cx18/cx18-streams.c b/drivers/media/video/cx18/cx18-streams.c index 1728b1d832a9..0da57f583bf7 100644 --- a/drivers/media/video/cx18/cx18-streams.c +++ b/drivers/media/video/cx18/cx18-streams.c | |||
@@ -187,14 +187,11 @@ static int cx18_prep_dev(struct cx18 *cx, int type) | |||
187 | return -ENOMEM; | 187 | return -ENOMEM; |
188 | } | 188 | } |
189 | 189 | ||
190 | s->v4l2dev->type = | ||
191 | VID_TYPE_CAPTURE | VID_TYPE_TUNER | VID_TYPE_TELETEXT | | ||
192 | VID_TYPE_CLIPPING | VID_TYPE_SCALES | VID_TYPE_MPEG_ENCODER; | ||
193 | snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "cx18-%d", | 190 | snprintf(s->v4l2dev->name, sizeof(s->v4l2dev->name), "cx18-%d", |
194 | cx->num); | 191 | cx->num); |
195 | 192 | ||
196 | s->v4l2dev->minor = minor; | 193 | s->v4l2dev->minor = minor; |
197 | s->v4l2dev->dev = &cx->dev->dev; | 194 | s->v4l2dev->parent = &cx->dev->dev; |
198 | s->v4l2dev->fops = cx18_stream_info[type].fops; | 195 | s->v4l2dev->fops = cx18_stream_info[type].fops; |
199 | s->v4l2dev->release = video_device_release; | 196 | s->v4l2dev->release = video_device_release; |
200 | s->v4l2dev->tvnorms = V4L2_STD_ALL; | 197 | s->v4l2dev->tvnorms = V4L2_STD_ALL; |