Skip to contentSkip to conversation

media: ipu3-cio2: Drop reference on error path in cio2_bridge_connect_sensor()

PATCH Applied Andy Shevchenko 2 participants 2 messages Aug 26, 2021

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

PATCH v2 1/1 media: ipu3-cio2: Drop reference on error path in cio2_bridge_connect_sensor()

The commit 71f642833284 ("ACPI: utils: Fix reference counting in for_each_acpi_dev_match()") moved adev assignment outside of error path and hence made acpi_dev_put(sensor->adev) a no-op. We still need to drop reference count on error path, and to achieve that, replace sensor->adev by locally assigned adev.

Fixes 71f642833284 ("ACPI: utils: Fix reference counting in for_each_acpi_dev_match()")

Depends-on: fc68f42aa737 ("ACPI: fix NULL pointer dereference")

---
v2: added tag (Sakari), Cc'ed to Rafael to pick up (would be nice to push it to v5.14)

 drivers/media/pci/intel/ipu3/cio2-bridge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/intel/ipu3/cio2-bridge.c +1 -1
index 59a36f922675..30d29b96a339 100644
@@ -226,7 +226,7 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg,
 err_free_swnodes:
 	software_node_unregister_nodes(sensor->swnodes);
 err_put_adev:
-	acpi_dev_put(sensor->adev);
+	acpi_dev_put(adev);
 	return ret;
 }
 
Signature · 1 line
2.32.0
maintainer Applied
#1 lore raw
Quoted 22 lines · Andy Shevchenko

The commit 71f642833284 ("ACPI: utils: Fix reference counting in for_each_acpi_dev_match()") moved adev assignment outside of error path and hence made acpi_dev_put(sensor->adev) a no-op. We still need to drop reference count on error path, and to achieve that, replace sensor->adev by locally assigned adev.

Fixes 71f642833284 ("ACPI: utils: Fix reference counting in for_each_acpi_dev_match()")

Depends-on: fc68f42aa737 ("ACPI: fix NULL pointer dereference")

---
v2: added tag (Sakari), Cc'ed to Rafael to pick up (would be nice to push it to v5.14)

 drivers/media/pci/intel/ipu3/cio2-bridge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/intel/ipu3/cio2-bridge.c +0 -0
index 59a36f922675..30d29b96a339 100644

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

Quoted 9 lines
drivers/media/pci/intel/ipu3/cio2-bridge.c +1 -2
@@ -226,7 +226,7 @@ static int cio2_bridge_connect_sensor(const struct cio2_sensor_config *cfg,
 err_free_swnodes:
        software_node_unregister_nodes(sensor->swnodes);
 err_put_adev:
-       acpi_dev_put(sensor->adev);
+       acpi_dev_put(adev);
        return ret;
 }
 
--

Applied as 5.14-rc material, thanks!