summaryrefslogtreecommitdiffstats
path: root/drivers/staging/fsl-dpaa2
diff options
context:
space:
mode:
authorIoana Ciornei2018-11-09 16:26:46 +0100
committerGreg Kroah-Hartman2019-02-12 19:46:59 +0100
commit3a11ec548c5b8d5c57cd249c9c2bae580f7fc29c (patch)
tree3d88b698c251c18747c0332843204615166307c0 /drivers/staging/fsl-dpaa2
parentMIPS: Boston: Disable EG20T prefetch (diff)
downloadkernel-qcow2-linux-3a11ec548c5b8d5c57cd249c9c2bae580f7fc29c.tar.gz
kernel-qcow2-linux-3a11ec548c5b8d5c57cd249c9c2bae580f7fc29c.tar.xz
kernel-qcow2-linux-3a11ec548c5b8d5c57cd249c9c2bae580f7fc29c.zip
dpaa2-ptp: defer probe when portal allocation failed
[ Upstream commit 5500598abbfb5b46201b9768bd9ea873a5eeaece ] The fsl_mc_portal_allocate can fail when the requested MC portals are not yet probed by the fsl_mc_allocator. In this situation, the driver should defer the probe. Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/staging/fsl-dpaa2')
-rw-r--r--drivers/staging/fsl-dpaa2/rtc/rtc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/fsl-dpaa2/rtc/rtc.c b/drivers/staging/fsl-dpaa2/rtc/rtc.c
index 0d52cb85441f..318a33c2f7a7 100644
--- a/drivers/staging/fsl-dpaa2/rtc/rtc.c
+++ b/drivers/staging/fsl-dpaa2/rtc/rtc.c
@@ -142,7 +142,10 @@ static int rtc_probe(struct fsl_mc_device *mc_dev)
err = fsl_mc_portal_allocate(mc_dev, 0, &mc_dev->mc_io);
if (err) {
- dev_err(dev, "fsl_mc_portal_allocate err %d\n", err);
+ if (err == -ENXIO)
+ err = -EPROBE_DEFER;
+ else
+ dev_err(dev, "fsl_mc_portal_allocate err %d\n", err);
goto err_exit;
}