Commit 6b2bed89 authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab

[media] st-hva: fix some error handling in hva_hw_probe()

The devm_ioremap_resource() returns error pointers, never NULL.  The
platform_get_resource() returns NULL on error, never error pointers.
The error code needs to be set, as well.  The current code returns
PTR_ERR(NULL) which is success.

Fixes: 57b2c062 ("[media] st-hva: multi-format video encoder V4L2 driver")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarJean-Christophe Trotin <jean-christophe.trotin@st.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent eadf0811
...@@ -305,16 +305,16 @@ int hva_hw_probe(struct platform_device *pdev, struct hva_dev *hva) ...@@ -305,16 +305,16 @@ int hva_hw_probe(struct platform_device *pdev, struct hva_dev *hva)
/* get memory for registers */ /* get memory for registers */
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
hva->regs = devm_ioremap_resource(dev, regs); hva->regs = devm_ioremap_resource(dev, regs);
if (IS_ERR_OR_NULL(hva->regs)) { if (IS_ERR(hva->regs)) {
dev_err(dev, "%s failed to get regs\n", HVA_PREFIX); dev_err(dev, "%s failed to get regs\n", HVA_PREFIX);
return PTR_ERR(hva->regs); return PTR_ERR(hva->regs);
} }
/* get memory for esram */ /* get memory for esram */
esram = platform_get_resource(pdev, IORESOURCE_MEM, 1); esram = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (IS_ERR_OR_NULL(esram)) { if (!esram) {
dev_err(dev, "%s failed to get esram\n", HVA_PREFIX); dev_err(dev, "%s failed to get esram\n", HVA_PREFIX);
return PTR_ERR(esram); return -ENODEV;
} }
hva->esram_addr = esram->start; hva->esram_addr = esram->start;
hva->esram_size = resource_size(esram); hva->esram_size = resource_size(esram);
......
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