projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_3.8-rc1' into v4l_for_linus
[deliverable/linux.git]
/
drivers
/
media
/
platform
/
s5p-fimc
/
fimc-mdevice.c
diff --git
a/drivers/media/platform/s5p-fimc/fimc-mdevice.c
b/drivers/media/platform/s5p-fimc/fimc-mdevice.c
index 9bd5dd4162206b261b94660d2e498404ef3c7072..1bd5678cfeb9d13f4bfd4b1dc0f7ffccac5ce33b 100644
(file)
--- a/
drivers/media/platform/s5p-fimc/fimc-mdevice.c
+++ b/
drivers/media/platform/s5p-fimc/fimc-mdevice.c
@@
-352,6
+352,7
@@
static int fimc_register_callback(struct device *dev, void *p)
sd = &fimc->vid_cap.subdev;
sd->grp_id = FIMC_GROUP_ID;
sd = &fimc->vid_cap.subdev;
sd->grp_id = FIMC_GROUP_ID;
+ v4l2_set_subdev_hostdata(sd, (void *)&fimc_pipeline_ops);
ret = v4l2_device_register_subdev(&fmd->v4l2_dev, sd);
if (ret) {
ret = v4l2_device_register_subdev(&fmd->v4l2_dev, sd);
if (ret) {
@@
-360,7
+361,6
@@
static int fimc_register_callback(struct device *dev, void *p)
return ret;
}
return ret;
}
- fimc->pipeline_ops = &fimc_pipeline_ops;
fmd->fimc[fimc->id] = fimc;
return 0;
}
fmd->fimc[fimc->id] = fimc;
return 0;
}
@@
-375,6
+375,7
@@
static int fimc_lite_register_callback(struct device *dev, void *p)
return 0;
fimc->subdev.grp_id = FLITE_GROUP_ID;
return 0;
fimc->subdev.grp_id = FLITE_GROUP_ID;
+ v4l2_set_subdev_hostdata(&fimc->subdev, (void *)&fimc_pipeline_ops);
ret = v4l2_device_register_subdev(&fmd->v4l2_dev, &fimc->subdev);
if (ret) {
ret = v4l2_device_register_subdev(&fmd->v4l2_dev, &fimc->subdev);
if (ret) {
@@
-384,7
+385,6
@@
static int fimc_lite_register_callback(struct device *dev, void *p)
return ret;
}
return ret;
}
- fimc->pipeline_ops = &fimc_pipeline_ops;
fmd->fimc_lite[fimc->index] = fimc;
return 0;
}
fmd->fimc_lite[fimc->index] = fimc;
return 0;
}
This page took
0.026429 seconds
and
5
git commands to generate.