summaryrefslogtreecommitdiff
path: root/drivers/media/video/omap3isp
diff options
context:
space:
mode:
authorJames Bottomley <JBottomley@Parallels.com>2011-07-23 21:09:03 +0400
committerJames Bottomley <JBottomley@Parallels.com>2011-07-23 21:09:03 +0400
commit87045b033a62777337ae4aa62834876da09b5fb5 (patch)
tree26aefd28e436668ff906e42b1e0d75c056e33e01 /drivers/media/video/omap3isp
parent0d83ab65ff1b54ce8b6cd172285cf71a38c4cceb (diff)
parentbfe159a51203c15d23cb3158fffdc25ec4b4dda1 (diff)
downloadlinux-87045b033a62777337ae4aa62834876da09b5fb5.tar.xz
Merge branch 'scsi-fixes'
Diffstat (limited to 'drivers/media/video/omap3isp')
-rw-r--r--drivers/media/video/omap3isp/isp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c
index c9fd04ee70a8..94b6ed89e195 100644
--- a/drivers/media/video/omap3isp/isp.c
+++ b/drivers/media/video/omap3isp/isp.c
@@ -1748,7 +1748,7 @@ static int isp_register_entities(struct isp_device *isp)
goto done;
/* Register external entities */
- for (subdevs = pdata->subdevs; subdevs->subdevs; ++subdevs) {
+ for (subdevs = pdata->subdevs; subdevs && subdevs->subdevs; ++subdevs) {
struct v4l2_subdev *sensor;
struct media_entity *input;
unsigned int flags;