Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 271807
b: refs/heads/master
c: 00542ed
h: refs/heads/master
i:
  271805: 75d7ec6
  271803: 9f33245
  271799: ac24ea3
  271791: e051b54
  271775: 10e17de
  271743: 02ff0f0
v: v3
  • Loading branch information
Laurent Pinchart authored and Mauro Carvalho Chehab committed Sep 11, 2011
1 parent 1ab42a6 commit 90912ec
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b796fb6ed032b0ccdb769b3b3bce5fb2b186a8f8
refs/heads/master: 00542edf071e249ccb541ffb2d2b9034e2533968
14 changes: 10 additions & 4 deletions trunk/drivers/media/video/omap3isp/ispvideo.c
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@ isp_video_far_end(struct isp_video *video)
* limits reported by every block in the pipeline.
*
* Return 0 if all formats match, or -EPIPE if at least one link is found with
* different formats on its two ends.
* different formats on its two ends or if the pipeline doesn't start with a
* video source (either a subdev with no input pad, or a non-subdev entity).
*/
static int isp_video_validate_pipeline(struct isp_pipeline *pipe)
{
Expand Down Expand Up @@ -329,10 +330,15 @@ static int isp_video_validate_pipeline(struct isp_pipeline *pipe)
* in the middle of it. */
shifter_link = subdev == &isp->isp_ccdc.subdev;

/* Retrieve the source format */
/* Retrieve the source format. Return an error if no source
* entity can be found, and stop checking the pipeline if the
* source entity isn't a subdev.
*/
pad = media_entity_remote_source(pad);
if (pad == NULL ||
media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
if (pad == NULL)
return -EPIPE;

if (media_entity_type(pad->entity) != MEDIA_ENT_T_V4L2_SUBDEV)
break;

subdev = media_entity_to_v4l2_subdev(pad->entity);
Expand Down

0 comments on commit 90912ec

Please sign in to comment.