Skip to contentSkip to conversation

media: ipu3-cio2: Fix missing error code in cio2_bridge_connect_sensor()

PATCH In review Jiapeng Chong 2 participants 2 messages Oct 15, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 media: ipu3-cio2: Fix missing error code in cio2_bridge_connect_sensor()

The error code is missing in this code scenario, add the error code '-EINVAL' to the return value 'ret'.

Eliminate the follow smatch warning:

drivers/media/pci/intel/ipu3/cio2-bridge.c:242 cio2_bridge_connect_sensor()
warn: missing error code 'ret'

Fixes 803abec64ef9 ("media: ipu3-cio2: Add cio2-bridge to ipu3-cio2 driver")
---
 drivers/media/pci/intel/ipu3/cio2-bridge.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/pci/intel/ipu3/cio2-bridge.c +3 -1
index 67c467d3..9e364ba 100644
@@ -238,8 +238,10 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg,
 			goto err_put_adev;
 
 		status = acpi_get_physical_device_location(adev->handle, &sensor->pld);
-		if (ACPI_FAILURE(status))
+		if (ACPI_FAILURE(status)) {
+			ret = -EINVAL;
 			goto err_put_adev;
+		}
 
 		if (sensor->ssdb.lanes > CIO2_MAX_LANES) {
 			dev_err(&adev->dev,
Signature · 1 line
1.8.3.1
#1 lore raw

Hi Jiapeng - thanks for the patch

Quoted 21 lines · Jiapeng Chong

The error code is missing in this code scenario, add the error code '-EINVAL' to the return value 'ret'.

Eliminate the follow smatch warning:

drivers/media/pci/intel/ipu3/cio2-bridge.c:242 cio2_bridge_connect_sensor()
warn: missing error code 'ret'

Fixes 803abec64ef9 ("media: ipu3-cio2: Add cio2-bridge to ipu3-cio2 driver")
---
 drivers/media/pci/intel/ipu3/cio2-bridge.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/media/pci/intel/ipu3/cio2-bridge.c +0 -0
index 67c467d3..9e364ba 100644
@@ -238,8 +238,10 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg,
 			goto err_put_adev;

drivers/media/pci/intel/ipu3/cio2-bridge.c static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg, · line 247

Quoted 10 lines
drivers/media/pci/intel/ipu3/cio2-bridge.c +3 -1
 
 		status = acpi_get_physical_device_location(adev->handle, &sensor->pld);
-		if (ACPI_FAILURE(status))
+		if (ACPI_FAILURE(status)) {
+			ret = -EINVAL;
 			goto err_put_adev;
+		}
 
 		if (sensor->ssdb.lanes > CIO2_MAX_LANES) {
 			dev_err(&adev->dev,

This was actually just patched already:
https://lore.kernel.org/linux-media/163421191963.3878617.4945041938867839263@Monstersaurus/T/#m3dfd290de36ae21e6de90d4c297ba27bb0647611