diff options
| author | Pavel Machek <pavel@ucw.cz> | 2017-03-02 13:45:32 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-07-19 21:49:45 +0200 |
| commit | a4573084cb7596b13e0853fa97b069c8fb30b6e7 (patch) | |
| tree | 309fe4e46263d57df835e27037791b56e3eb601c /drivers/media/platform/omap3isp/isp.c | |
| parent | media: omap3isp: add CSI1 support (diff) | |
| download | linux-a4573084cb7596b13e0853fa97b069c8fb30b6e7.tar.xz linux-a4573084cb7596b13e0853fa97b069c8fb30b6e7.zip | |
media: omap3isp: Return -EPROBE_DEFER if the required regulators can't be obtained
If regulator returns -EPROBE_DEFER, we need to return it too, so that
omap3isp will be re-probed when regulator is ready.
Signed-off-by: Pavel Machek <pavel@ucw.cz>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform/omap3isp/isp.c')
| -rw-r--r-- | drivers/media/platform/omap3isp/isp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index db2cccb57ceb..dbaede0d8974 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c @@ -1880,7 +1880,8 @@ static int isp_initialize_modules(struct isp_device *isp) ret = omap3isp_ccp2_init(isp); if (ret < 0) { - dev_err(isp->dev, "CCP2 initialization failed\n"); + if (ret != -EPROBE_DEFER) + dev_err(isp->dev, "CCP2 initialization failed\n"); goto error_ccp2; } |