On Wed, Sep 12, 2012 at 8:24 AM, Jiang Liu <liuj97@xxxxxxxxx> wrote:
> Fix a device reference count leakage issue in function
> eeepc_rfkill_hotplug().
This looks good to me, but it needs a Signed-off-by and probably
should go through something other than the PCI tree.
Reviewed-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
> ---
> drivers/platform/x86/eeepc-laptop.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
> index dab91b4..5ca2641 100644
> --- a/drivers/platform/x86/eeepc-laptop.c
> +++ b/drivers/platform/x86/eeepc-laptop.c
> @@ -610,12 +610,12 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle)
>
> if (!bus) {
> pr_warn("Unable to find PCI bus 1?\n");
> - goto out_unlock;
> + goto out_put_dev;
> }
>
> if (pci_bus_read_config_dword(bus, 0, PCI_VENDOR_ID, &l)) {
> pr_err("Unable to read PCI config space?\n");
> - goto out_unlock;
> + goto out_put_dev;
> }
>
> absent = (l == 0xffffffff);
> @@ -627,7 +627,7 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle)
> absent ? "absent" : "present");
> pr_warn("skipped wireless hotplug as probably "
> "inappropriate for this model\n");
> - goto out_unlock;
> + goto out_put_dev;
> }
>
> if (!blocked) {
> @@ -635,7 +635,7 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle)
> if (dev) {
> /* Device already present */
> pci_dev_put(dev);
> - goto out_unlock;
> + goto out_put_dev;
> }
> dev = pci_scan_single_device(bus, 0);
> if (dev) {
> @@ -650,6 +650,8 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle)
> pci_dev_put(dev);
> }
> }
> +out_put_dev:
> + pci_dev_put(port);
> }
>
> out_unlock:
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
