commit 9d8333b29207de3a9b6ac99db2dfd91e2f8c0216
author Sebastian Reichel <sre@kernel.org> Fri Apr 29 19:23:02 2016 +0200
committer Sebastian Reichel <sre@kernel.org> Fri Apr 29 19:23:05 2016 +0200
tree 569525c9ddace7459e3edf867a45c545185c4b6c
parent 9a338b88b811e9d626694caf1dbf21b6dd35aad1

omap3isp: handle -EPROBE_DEFER for vdds_csib

omap3isp may be initialized before the regulator's driver has been
loaded. Fix this by handling -EPROBE_DEFER for vdds_csib.

Signed-Off-By: Sebastian Reichel <sre@kernel.org>

drivers/media/platform/omap3isp/ispccp2.c

diff --git a/drivers/media/platform/omap3isp/ispccp2.c b/drivers/media/platform/omap3isp/ispccp2.c
index 833eed4..2d1463a 100644
--- a/drivers/media/platform/omap3isp/ispccp2.c
+++ b/drivers/media/platform/omap3isp/ispccp2.c
@@ -1167,6 +1167,8 @@
 	if (isp->revision == ISP_REVISION_2_0) {
 		ccp2->vdds_csib = devm_regulator_get(isp->dev, "vdds_csib");
 		if (IS_ERR(ccp2->vdds_csib)) {
+			if (PTR_ERR(ccp2->vdds_csib) == -EPROBE_DEFER)
+				return -EPROBE_DEFER;
 			dev_dbg(isp->dev,
 				"Could not get regulator vdds_csib\n");
 			ccp2->vdds_csib = NULL;