[ 36/42] acpi_video: fix leaking PCI references
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-06-15 00:02:55
Also in:
lkml
3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alan Cox <redacted> commit cfb46f433a4da97c31780e08a259fac2cb6bd61f upstream. Signed-off-by: Alan Cox <redacted> Acked-by: Matthew Garrett <redacted> Signed-off-by: Len Brown <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/acpi/video.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c@@ -1745,6 +1745,7 @@ static int acpi_video_bus_remove(struct static int __init intel_opregion_present(void) { + int i915 = 0; #if defined(CONFIG_DRM_I915) || defined(CONFIG_DRM_I915_MODULE) struct pci_dev *dev = NULL; u32 address;
@@ -1757,10 +1758,10 @@ static int __init intel_opregion_present pci_read_config_dword(dev, 0xfc, &address); if (!address) continue; - return 1; + i915 = 1; } #endif - return 0; + return i915; } int acpi_video_register(void)