Commit e03eb362 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mauro Carvalho Chehab

media: imx-pxp: Check for pxp_soft_reset() error

pxp_soft_reset() may fail with a timeout, so it is better to propagate
the error in this case.
Signed-off-by: default avatarFabio Estevam <festevam@gmail.com>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hansverk@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent efceb765
...@@ -1607,7 +1607,7 @@ static const struct v4l2_m2m_ops m2m_ops = { ...@@ -1607,7 +1607,7 @@ static const struct v4l2_m2m_ops m2m_ops = {
.job_abort = pxp_job_abort, .job_abort = pxp_job_abort,
}; };
static void pxp_soft_reset(struct pxp_dev *dev) static int pxp_soft_reset(struct pxp_dev *dev)
{ {
int ret; int ret;
u32 val; u32 val;
...@@ -1619,11 +1619,15 @@ static void pxp_soft_reset(struct pxp_dev *dev) ...@@ -1619,11 +1619,15 @@ static void pxp_soft_reset(struct pxp_dev *dev)
ret = readl_poll_timeout(dev->mmio + HW_PXP_CTRL, val, ret = readl_poll_timeout(dev->mmio + HW_PXP_CTRL, val,
val & BM_PXP_CTRL_CLKGATE, 0, 100); val & BM_PXP_CTRL_CLKGATE, 0, 100);
if (ret < 0) if (ret < 0) {
pr_err("PXP reset timeout\n"); pr_err("PXP reset timeout\n");
return ret;
}
writel(BM_PXP_CTRL_SFTRST, dev->mmio + HW_PXP_CTRL_CLR); writel(BM_PXP_CTRL_SFTRST, dev->mmio + HW_PXP_CTRL_CLR);
writel(BM_PXP_CTRL_CLKGATE, dev->mmio + HW_PXP_CTRL_CLR); writel(BM_PXP_CTRL_CLKGATE, dev->mmio + HW_PXP_CTRL_CLR);
return 0;
} }
static int pxp_probe(struct platform_device *pdev) static int pxp_probe(struct platform_device *pdev)
...@@ -1670,7 +1674,9 @@ static int pxp_probe(struct platform_device *pdev) ...@@ -1670,7 +1674,9 @@ static int pxp_probe(struct platform_device *pdev)
if (ret < 0) if (ret < 0)
return ret; return ret;
pxp_soft_reset(dev); ret = pxp_soft_reset(dev);
if (ret < 0)
goto err_clk;
spin_lock_init(&dev->irqlock); spin_lock_init(&dev->irqlock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment