aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv/ivtvfb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/ivtv/ivtvfb.c')
-rw-r--r--drivers/media/video/ivtv/ivtvfb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c
index 36abd2aef6f1..66e6eb513076 100644
--- a/drivers/media/video/ivtv/ivtvfb.c
+++ b/drivers/media/video/ivtv/ivtvfb.c
@@ -1192,12 +1192,12 @@ static int ivtvfb_init_card(struct ivtv *itv)
1192static int __init ivtvfb_callback_init(struct device *dev, void *p) 1192static int __init ivtvfb_callback_init(struct device *dev, void *p)
1193{ 1193{
1194 struct v4l2_device *v4l2_dev = dev_get_drvdata(dev); 1194 struct v4l2_device *v4l2_dev = dev_get_drvdata(dev);
1195 struct ivtv *itv = container_of(v4l2_dev, struct ivtv, device); 1195 struct ivtv *itv = container_of(v4l2_dev, struct ivtv, v4l2_dev);
1196 1196
1197 if (itv && (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) { 1197 if (itv && (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) {
1198 if (ivtvfb_init_card(itv) == 0) { 1198 if (ivtvfb_init_card(itv) == 0) {
1199 IVTVFB_INFO("Framebuffer registered on %s\n", 1199 IVTVFB_INFO("Framebuffer registered on %s\n",
1200 itv->device.name); 1200 itv->v4l2_dev.name);
1201 (*(int *)p)++; 1201 (*(int *)p)++;
1202 } 1202 }
1203 } 1203 }
@@ -1207,7 +1207,7 @@ static int __init ivtvfb_callback_init(struct device *dev, void *p)
1207static int ivtvfb_callback_cleanup(struct device *dev, void *p) 1207static int ivtvfb_callback_cleanup(struct device *dev, void *p)
1208{ 1208{
1209 struct v4l2_device *v4l2_dev = dev_get_drvdata(dev); 1209 struct v4l2_device *v4l2_dev = dev_get_drvdata(dev);
1210 struct ivtv *itv = container_of(v4l2_dev, struct ivtv, device); 1210 struct ivtv *itv = container_of(v4l2_dev, struct ivtv, v4l2_dev);
1211 1211
1212 if (itv && (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) { 1212 if (itv && (itv->v4l2_cap & V4L2_CAP_VIDEO_OUTPUT)) {
1213 if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) { 1213 if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) {