diff options
| author |   Fabio Estevam <festevam@gmail.com> | 2018-11-06 05:16:05 -0500 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-11-23 05:38:50 -0500 |
| commit | 3431ebe5a6c0ec665f25464183c7a810e483dee8 (patch) | |
| tree | 25f9eeee8a6a88d1b663e67e8f7ee3110cf5b74c | |
| parent | media: imx-pxp: Check for pxp_soft_reset() error (diff) | |
| download | linux-dev-3431ebe5a6c0ec665f25464183c7a810e483dee8.tar.xz linux-dev-3431ebe5a6c0ec665f25464183c7a810e483dee8.zip | |
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: Fabio Estevam <festevam@gmail.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hansverk@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
| -rw-r--r-- | drivers/media/platform/imx-pxp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/imx-pxp.c b/drivers/media/platform/imx-pxp.c index 986764de5616..b80d206f2b81 100644 --- a/drivers/media/platform/imx-pxp.c +++ b/drivers/media/platform/imx-pxp.c @@ -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); |