* [patch] [media] st-hva: fix some error handling in hva_hw_probe()
@ 2016-10-14 7:32 Dan Carpenter
2016-10-24 8:26 ` Jean Christophe TROTIN
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2016-10-14 7:32 UTC (permalink / raw)
To: Jean-Christophe Trotin
Cc: Mauro Carvalho Chehab, linux-media, kernel-janitors
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: 57b2c0628b60 ("[media] st-hva: multi-format video encoder V4L2 driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/media/platform/sti/hva/hva-hw.c b/drivers/media/platform/sti/hva/hva-hw.c
index d341d49..cf2a8d8 100644
--- a/drivers/media/platform/sti/hva/hva-hw.c
+++ b/drivers/media/platform/sti/hva/hva-hw.c
@@ -305,16 +305,16 @@ int hva_hw_probe(struct platform_device *pdev, struct hva_dev *hva)
/* get memory for registers */
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
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);
return PTR_ERR(hva->regs);
}
/* get memory for esram */
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);
- return PTR_ERR(esram);
+ return -ENODEV;
}
hva->esram_addr = esram->start;
hva->esram_size = resource_size(esram);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] [media] st-hva: fix some error handling in hva_hw_probe()
2016-10-14 7:32 [patch] [media] st-hva: fix some error handling in hva_hw_probe() Dan Carpenter
@ 2016-10-24 8:26 ` Jean Christophe TROTIN
0 siblings, 0 replies; 2+ messages in thread
From: Jean Christophe TROTIN @ 2016-10-24 8:26 UTC (permalink / raw)
To: Dan Carpenter
Cc: Mauro Carvalho Chehab, linux-media@vger.kernel.org,
kernel-janitors@vger.kernel.org
Thanks,
Acked-by: Jean-Christophe Trotin <jean-christophe.trotin@st.com>
On 10/14/2016 09:32 AM, Dan Carpenter wrote:
> 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: 57b2c0628b60 ("[media] st-hva: multi-format video encoder V4L2 driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/media/platform/sti/hva/hva-hw.c b/drivers/media/platform/sti/hva/hva-hw.c
> index d341d49..cf2a8d8 100644
> --- a/drivers/media/platform/sti/hva/hva-hw.c
> +++ b/drivers/media/platform/sti/hva/hva-hw.c
> @@ -305,16 +305,16 @@ int hva_hw_probe(struct platform_device *pdev, struct hva_dev *hva)
> /* get memory for registers */
> regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> 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);
> return PTR_ERR(hva->regs);
> }
>
> /* get memory for esram */
> 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);
> - return PTR_ERR(esram);
> + return -ENODEV;
> }
> hva->esram_addr = esram->start;
> hva->esram_size = resource_size(esram);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-24 8:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-14 7:32 [patch] [media] st-hva: fix some error handling in hva_hw_probe() Dan Carpenter
2016-10-24 8:26 ` Jean Christophe TROTIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox