diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-13 07:02:43 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:48 -0400 |
| commit | c0714f6cc6a7850062db41d5b2b8b90e5682ae41 (patch) | |
| tree | 613844eec6820177fba20d290c99949878dbb219 /drivers/media/video/cx23885/cx23885-video.c | |
| parent | 8bbd90ce80d39d372857235f00c7abb208bd9e4f (diff) | |
V4L/DVB (11295): cx23885: convert to v4l2_device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885/cx23885-video.c')
| -rw-r--r-- | drivers/media/video/cx23885/cx23885-video.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c index 726602935353..1596f4ff3dfe 100644 --- a/drivers/media/video/cx23885/cx23885-video.c +++ b/drivers/media/video/cx23885/cx23885-video.c | |||
| @@ -320,8 +320,8 @@ static struct video_device *cx23885_vdev_init(struct cx23885_dev *dev, | |||
| 320 | if (NULL == vfd) | 320 | if (NULL == vfd) |
| 321 | return NULL; | 321 | return NULL; |
| 322 | *vfd = *template; | 322 | *vfd = *template; |
| 323 | vfd->minor = -1; | 323 | vfd->minor = -1; |
| 324 | vfd->parent = &pci->dev; | 324 | vfd->v4l2_dev = &dev->v4l2_dev; |
| 325 | vfd->release = video_device_release; | 325 | vfd->release = video_device_release; |
| 326 | snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", | 326 | snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)", |
| 327 | dev->name, type, cx23885_boards[dev->board].name); | 327 | dev->name, type, cx23885_boards[dev->board].name); |