Skip to contentSkip to conversation

media: ti-vpe: cal: fix indexing of cal->ctx[] in cal_probe()

PATCH New [email protected] 1 participant 1 message Jul 16, 2021 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: ti-vpe: cal: fix indexing of cal->ctx[] in cal_probe()

From: Tom Rix <[email protected]>

cal->ctx[i] is allocated with this loop

	for (i = 0; i < cal->data->num_csi2_phy; ++i) {
and accessed in the error handler and else where with this loop
	for (i = 0; i < cal->num_contexts; i++)

Because the first loop contains a continue statement before cal->num_contexts is incremented, using i as the indexer will leave gaps in the cal->ctx[].

So use cal->num_contexts as the indexer.

Fixes 75e7e58bfac1 ("media: ti-vpe: cal: support 8 DMA contexts")
---
 drivers/media/platform/ti-vpe/cal.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/media/platform/ti-vpe/cal.c +3 -3
index 05bdc6d126d82..8e469d518a742 100644
@@ -1148,9 +1148,9 @@ static int cal_probe(struct platform_device *pdev)
 		if (!cal->phy[i]->source_node)
 			continue;
 
-		cal->ctx[i] = cal_ctx_create(cal, i);
-		if (!cal->ctx[i]) {
-			cal_err(cal, "Failed to create context %u\n", i);
+		cal->ctx[cal->num_contexts] = cal_ctx_create(cal, i);
+		if (!cal->ctx[cal->num_contexts]) {
+			cal_err(cal, "Failed to create context %u\n", cal->num_contexts);
 			ret = -ENODEV;
 			goto error_context;
 		}
Signature · 1 line
2.26.3