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-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[deliverable/linux.git]
/
drivers
/
media
/
platform
/
exynos4-is
/
media-dev.c
diff --git
a/drivers/media/platform/exynos4-is/media-dev.c
b/drivers/media/platform/exynos4-is/media-dev.c
index 4f494acd8150fd85f8aaedfb3572b85bb22b460d..891625e77ef566504ca9024008124d2fffd4089f 100644
(file)
--- a/
drivers/media/platform/exynos4-is/media-dev.c
+++ b/
drivers/media/platform/exynos4-is/media-dev.c
@@
-446,8
+446,10
@@
static int fimc_md_parse_port_node(struct fimc_md *fmd,
else
pd->fimc_bus_type = pd->sensor_bus_type;
else
pd->fimc_bus_type = pd->sensor_bus_type;
- if (WARN_ON(index >= ARRAY_SIZE(fmd->sensor)))
+ if (WARN_ON(index >= ARRAY_SIZE(fmd->sensor))) {
+ of_node_put(rem);
return -EINVAL;
return -EINVAL;
+ }
fmd->sensor[index].asd.match_type = V4L2_ASYNC_MATCH_OF;
fmd->sensor[index].asd.match.of.node = rem;
fmd->sensor[index].asd.match_type = V4L2_ASYNC_MATCH_OF;
fmd->sensor[index].asd.match.of.node = rem;
@@
-1130,7
+1132,7
@@
static int __fimc_md_modify_pipelines(struct media_entity *entity, bool enable,
media_entity_graph_walk_start(graph, entity);
while ((entity = media_entity_graph_walk_next(graph))) {
media_entity_graph_walk_start(graph, entity);
while ((entity = media_entity_graph_walk_next(graph))) {
- if (!is_media_entity_v4l2_
io
(entity))
+ if (!is_media_entity_v4l2_
video_device
(entity))
continue;
ret = __fimc_md_modify_pipeline(entity, enable);
continue;
ret = __fimc_md_modify_pipeline(entity, enable);
@@
-1145,7
+1147,7
@@
err:
media_entity_graph_walk_start(graph, entity_err);
while ((entity_err = media_entity_graph_walk_next(graph))) {
media_entity_graph_walk_start(graph, entity_err);
while ((entity_err = media_entity_graph_walk_next(graph))) {
- if (!is_media_entity_v4l2_
io
(entity_err))
+ if (!is_media_entity_v4l2_
video_device
(entity_err))
continue;
__fimc_md_modify_pipeline(entity_err, !enable);
continue;
__fimc_md_modify_pipeline(entity_err, !enable);
This page took
0.025345 seconds
and
5
git commands to generate.