| Message ID | 20230102202933.15968-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v1,1/2] usb: typec: intel_pmc_mux: Don't leak the ACPI device reference count | expand |
On Mon, Jan 02, 2023 at 10:29:33PM +0200, Andy Shevchenko wrote: > There is no need to call acpi_dev_present() followed by > acpi_dev_get_first_match_dev() as they both do the same > with only difference in the returning value. Instead, > call the latter and check its result. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/usb/typec/mux/intel_pmc_mux.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c > index 87e2c9130607..34e4188a40ff 100644 > --- a/drivers/usb/typec/mux/intel_pmc_mux.c > +++ b/drivers/usb/typec/mux/intel_pmc_mux.c > @@ -602,16 +602,15 @@ static int pmc_usb_probe_iom(struct pmc_usb *pmc) > int ret; > > for (dev_id = &iom_acpi_ids[0]; dev_id->id[0]; dev_id++) { > - if (acpi_dev_present(dev_id->id, NULL, -1)) { > - pmc->iom_port_status_offset = (u32)dev_id->driver_data; > - adev = acpi_dev_get_first_match_dev(dev_id->id, NULL, -1); > + adev = acpi_dev_get_first_match_dev(dev_id->id, NULL, -1); > + if (adev) > break; > - } > } > - > if (!adev) > return -ENODEV; > > + pmc->iom_port_status_offset = (u32)dev_id->driver_data; > + > INIT_LIST_HEAD(&resource_list); > ret = acpi_dev_get_memory_resources(adev, &resource_list); > if (ret < 0) { > -- > 2.35.1
diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c index fdbf3694e21f..87e2c9130607 100644 --- a/drivers/usb/typec/mux/intel_pmc_mux.c +++ b/drivers/usb/typec/mux/intel_pmc_mux.c @@ -614,8 +614,10 @@ static int pmc_usb_probe_iom(struct pmc_usb *pmc) INIT_LIST_HEAD(&resource_list); ret = acpi_dev_get_memory_resources(adev, &resource_list); - if (ret < 0) + if (ret < 0) { + acpi_dev_put(adev); return ret; + } rentry = list_first_entry_or_null(&resource_list, struct resource_entry, node); if (rentry)
When acpi_dev_get_memory_resources() fails, the reference count is left bumped. Drop it as it's done in the other error paths. Fixes: 43d596e32276 ("usb: typec: intel_pmc_mux: Check the port status before connect") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/usb/typec/mux/intel_pmc_mux.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)