提交 3431ebe5 编写于 作者: F Fabio Estevam 提交者: Mauro Carvalho Chehab

media: imx-pxp: Improve pxp_soft_reset() error message

Improve the pxp_soft_reset() error message by moving it to the
caller function, associating it with a proper device and also
by displaying the error code.
Signed-off-by: NFabio Estevam <festevam@gmail.com>
Reviewed-by: NPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: NHans Verkuil <hansverk@cisco.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab+samsung@kernel.org>
上级 e03eb362
......@@ -1619,10 +1619,8 @@ static int pxp_soft_reset(struct pxp_dev *dev)
ret = readl_poll_timeout(dev->mmio + HW_PXP_CTRL, val,
val & BM_PXP_CTRL_CLKGATE, 0, 100);
if (ret < 0) {
pr_err("PXP reset timeout\n");
if (ret < 0)
return ret;
}
writel(BM_PXP_CTRL_SFTRST, dev->mmio + HW_PXP_CTRL_CLR);
writel(BM_PXP_CTRL_CLKGATE, dev->mmio + HW_PXP_CTRL_CLR);
......@@ -1675,8 +1673,10 @@ static int pxp_probe(struct platform_device *pdev)
return ret;
ret = pxp_soft_reset(dev);
if (ret < 0)
if (ret < 0) {
dev_err(&pdev->dev, "PXP reset timeout: %d\n", ret);
goto err_clk;
}
spin_lock_init(&dev->irqlock);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册