forked from Minki/linux
eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug()
Fix a device reference count leakage issue in function eeepc_rfkill_hotplug(). Signed-off-by: Jiang Liu <jiang.liu@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
This commit is contained in:
parent
3f5449bf39
commit
f661848b74
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user