diff --git a/[refs] b/[refs] index 6f34714d7ad7..94801c74f658 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a694f1b2af4942a1e0026e7929b4f7c5c251f82d +refs/heads/master: 0bd0dbee3f49c46ba860f21f97a98ac64781be5d diff --git a/trunk/drivers/media/platform/omap3isp/isp.c b/trunk/drivers/media/platform/omap3isp/isp.c index e0096e07dbdc..d7aa513dcc8d 100644 --- a/trunk/drivers/media/platform/omap3isp/isp.c +++ b/trunk/drivers/media/platform/omap3isp/isp.c @@ -2102,8 +2102,10 @@ static int __devinit isp_probe(struct platform_device *pdev) if (ret < 0) goto error; - if (__omap3isp_get(isp, false) == NULL) + if (__omap3isp_get(isp, false) == NULL) { + ret = -ENODEV; goto error; + } ret = isp_reset(isp); if (ret < 0)