media: ipu3-cio2: Drop reference on error path in cio2_bridge_connect_sensor()
Subsystems (3)
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.
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
@@ -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
Quoted 22 lines · Andy Shevchenko
The commit
71f642833284("ACPI: utils: Fix reference counting infor_each_acpi_dev_match()") moved adev assignment outside of error path and hence madeacpi_dev_put(sensor->adev)a no-op. We still need to drop reference count on error path, and to achieve that, replacesensor->adevby locally assigned adev.Fixes 71f642833284 ("ACPI: utils: Fix reference counting in for_each_acpi_dev_match()")Depends-on:
fc68f42aa737("ACPI: fix NULL pointer dereference")Reported-by Jens Axboe <[email protected]>Signed-off-by Andy Shevchenko <[email protected]>Acked-by Sakari Ailus <[email protected]>---
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
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!