raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

media: i2c: imx500: pm_runtime error paths

Browse Source 
This change amends various error-paths in imx500_start_streaming() to
ensure that pm_runtime refcounts do not remain erroneously incremented
on failure.

Signed-off-by: Richard Oliver <richard.oliver@raspberrypi.com>
This commit is contained in:
Richard Oliver
2025-06-05 11:16:53 +01:00
parent b2a413260f
commit 893915d5ce
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/media/i2c/imx500.c
View File

@@ -2512,7 +2512,7 @@ static int imx500_start_streaming(struct imx500 *imx500)
if (ret) {
dev_err(&client->dev, "%s failed to set image mode\n",
__func__);
return ret;
goto err_runtime_put;
}
/* Acquire loader and main firmware if needed */
@@ -2524,7 +2524,7 @@ static int imx500_start_streaming(struct imx500 *imx500)
if (ret) {
dev_err(&client->dev,
"Unable to acquire firmware loader\n");
return ret;
goto err_runtime_put;
}
}
if (!imx500->fw_main) {
@@ -2534,7 +2534,7 @@ static int imx500_start_streaming(struct imx500 *imx500)
if (ret) {
dev_err(&client->dev,
"Unable to acquire main firmware\n");
return ret;
goto err_runtime_put;
}
}
}
@@ -2546,7 +2546,7 @@ static int imx500_start_streaming(struct imx500 *imx500)
if (ret) {
dev_err(&client->dev,
"%s failed to set common settings\n", __func__);
return ret;
goto err_runtime_put;
}
imx500->common_regs_written = true;
@@ -2558,7 +2558,7 @@ static int imx500_start_streaming(struct imx500 *imx500)
dev_err(&client->dev,
"%s failed to transition from program empty state\n",
__func__);
return ret;
goto err_runtime_put;
}
imx500->loader_and_main_written = true;
}
@@ -2569,7 +2569,7 @@ static int imx500_start_streaming(struct imx500 *imx500)
dev_err(&client->dev,
"%s failed to transition to network loaded\n",
__func__);
return ret;
goto err_runtime_put;
}
imx500->network_written = true;
}
@@ -2580,7 +2580,7 @@ static int imx500_start_streaming(struct imx500 *imx500)
if (ret) {
dev_err(&client->dev, "%s failed to enable DNN\n",
__func__);
return ret;
goto err_runtime_put;
}
}
@@ -2590,7 +2590,7 @@ static int imx500_start_streaming(struct imx500 *imx500)
reg_list->num_of_regs, NULL);
if (ret) {
dev_err(&client->dev, "%s failed to set mode\n", __func__);
return ret;
goto err_runtime_put;
}
/* Apply customized values from user */
@@ -2603,6 +2603,14 @@ static int imx500_start_streaming(struct imx500 *imx500)
cci_write(imx500->regmap, IMX500_REG_MODE_SELECT, IMX500_MODE_STREAMING,
&ret);
if (ret)
goto err_runtime_put;
return 0;
err_runtime_put:
pm_runtime_mark_last_busy(&client->dev);
pm_runtime_put_autosuspend(&client->dev);
return ret;
}