diff options
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-driver.c')
-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 3dda84d115d1..fff2fffcad63 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -163,7 +163,7 @@ MODULE_LICENSE("GPL"); | |||
163 | static ssize_t show_card(struct device *cd, | 163 | 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, dev); |
167 | struct bttv *btv = dev_get_drvdata(vfd->parent); | 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 | } |
@@ -4244,7 +4244,7 @@ static int __devinit bttv_register_video(struct bttv *btv) | |||
4244 | goto err; | 4244 | goto err; |
4245 | printk(KERN_INFO "bttv%d: registered device video%d\n", | 4245 | printk(KERN_INFO "bttv%d: registered device video%d\n", |
4246 | btv->c.nr,btv->video_dev->minor & 0x1f); | 4246 | btv->c.nr,btv->video_dev->minor & 0x1f); |
4247 | if (device_create_file(&btv->video_dev->class_dev, | 4247 | if (device_create_file(&btv->video_dev->dev, |
4248 | &dev_attr_card)<0) { | 4248 | &dev_attr_card)<0) { |
4249 | printk(KERN_ERR "bttv%d: device_create_file 'card' " | 4249 | printk(KERN_ERR "bttv%d: device_create_file 'card' " |
4250 | "failed\n", btv->c.nr); | 4250 | "failed\n", btv->c.nr); |