diff options
Diffstat (limited to 'drivers/media/video/bt8xx')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 0ea559a7fe59..3dda84d115d1 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -164,7 +164,7 @@ static ssize_t show_card(struct device *cd, | |||
164 | struct device_attribute *attr, char *buf) | 164 | struct device_attribute *attr, char *buf) |
165 | { | 165 | { |
166 | struct video_device *vfd = container_of(cd, struct video_device, class_dev); | 166 | struct video_device *vfd = container_of(cd, struct video_device, class_dev); |
167 | struct bttv *btv = dev_get_drvdata(vfd->dev); | 167 | struct bttv *btv = dev_get_drvdata(vfd->parent); |
168 | return sprintf(buf, "%d\n", btv ? btv->c.type : UNSET); | 168 | return sprintf(buf, "%d\n", btv ? btv->c.type : UNSET); |
169 | } | 169 | } |
170 | static DEVICE_ATTR(card, S_IRUGO, show_card, NULL); | 170 | static DEVICE_ATTR(card, S_IRUGO, show_card, NULL); |
@@ -4185,7 +4185,7 @@ static struct video_device *vdev_init(struct bttv *btv, | |||
4185 | return NULL; | 4185 | return NULL; |
4186 | *vfd = *template; | 4186 | *vfd = *template; |
4187 | vfd->minor = -1; | 4187 | vfd->minor = -1; |
4188 | vfd->dev = &btv->c.pci->dev; | 4188 | vfd->parent = &btv->c.pci->dev; |
4189 | vfd->release = video_device_release; | 4189 | vfd->release = video_device_release; |
4190 | vfd->type = type; | 4190 | vfd->type = type; |
4191 | vfd->debug = bttv_debug; | 4191 | vfd->debug = bttv_debug; |