From: Felix Gu <ustc.gu@gmail.com>
To: Yemike Abhilash Chandra <y-abhilashchandra@ti.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Dale Farnsworth <dale@farnsworth.org>,
Benoit Parrot <bparrot@ti.com>,
Hans Verkuil <hverkuil+cisco@kernel.org>,
Sukrut Bellary <sbellary@baylibre.com>
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
Felix Gu <ustc.gu@gmail.com>
Subject: [PATCH v2 3/3] media: ti: vpe: Fix the error code of devm_kzalloc() in vip_probe_slice()
Date: Sat, 21 Mar 2026 21:12:56 +0800 [thread overview]
Message-ID: <20260321-vip-v2-3-d502c1954817@gmail.com> (raw)
In-Reply-To: <20260321-vip-v2-0-d502c1954817@gmail.com>
In vip_probe_slice(), the error check for devm_kzalloc() incorrectly
uses PTR_ERR_OR_ZERO() which returns 0 for NULL pointer.
Return -ENOMEM for devm_kzalloc() failure.
Fixes: fc2873aa4a21 ("media: ti: vpe: Add the VIP driver")
Signed-off-by: Felix Gu <ustc.gu@gmail.com>
---
drivers/media/platform/ti/vpe/vip.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/ti/vpe/vip.c b/drivers/media/platform/ti/vpe/vip.c
index ea65b7ec9b09..c2da11cc5cfa 100644
--- a/drivers/media/platform/ti/vpe/vip.c
+++ b/drivers/media/platform/ti/vpe/vip.c
@@ -3489,7 +3489,7 @@ static int vip_probe_slice(struct platform_device *pdev, int slice)
parser = devm_kzalloc(&pdev->dev, sizeof(*dev->parser), GFP_KERNEL);
if (!parser)
- return PTR_ERR_OR_ZERO(parser);
+ return -ENOMEM;
parser->base = dev->base + (slice ? VIP_SLICE1_PARSER : VIP_SLICE0_PARSER);
if (IS_ERR(parser->base))
@@ -3501,7 +3501,7 @@ static int vip_probe_slice(struct platform_device *pdev, int slice)
dev->sc_assigned = VIP_NOT_ASSIGNED;
sc = devm_kzalloc(&pdev->dev, sizeof(*dev->sc), GFP_KERNEL);
if (!sc)
- return PTR_ERR_OR_ZERO(sc);
+ return -ENOMEM;
sc->base = dev->base + (slice ? VIP_SLICE1_SC : VIP_SLICE0_SC);
if (IS_ERR(sc->base))
@@ -3513,7 +3513,7 @@ static int vip_probe_slice(struct platform_device *pdev, int slice)
dev->csc_assigned = VIP_NOT_ASSIGNED;
csc = devm_kzalloc(&pdev->dev, sizeof(*dev->csc), GFP_KERNEL);
if (!csc)
- return PTR_ERR_OR_ZERO(csc);
+ return -ENOMEM;
csc->base = dev->base + (slice ? VIP_SLICE1_CSC : VIP_SLICE0_CSC);
if (IS_ERR(csc->base))
--
2.43.0
next prev parent reply other threads:[~2026-03-21 13:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-21 13:12 [PATCH v2 0/3] media: ti: vpe: three small fixes Felix Gu
2026-03-21 13:12 ` [PATCH v2 1/3] media: ti: vpe: Fix fwnode_handle leak in vip_probe_complete() Felix Gu
2026-03-21 13:12 ` [PATCH v2 2/3] media: ti: vpe: Fix the error code of devm_request_irq() Felix Gu
2026-03-21 19:30 ` Markus Elfring
2026-03-21 13:12 ` Felix Gu [this message]
2026-03-21 19:40 ` [PATCH v2 3/3] media: ti: vpe: Fix the error code of devm_kzalloc() in vip_probe_slice() Markus Elfring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260321-vip-v2-3-d502c1954817@gmail.com \
--to=ustc.gu@gmail.com \
--cc=bparrot@ti.com \
--cc=dale@farnsworth.org \
--cc=hverkuil+cisco@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sbellary@baylibre.com \
--cc=y-abhilashchandra@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox