| From cfb46f433a4da97c31780e08a259fac2cb6bd61f Mon Sep 17 00:00:00 2001 |
| From: Alan Cox <alan@linux.intel.com> |
| Date: Wed, 25 Apr 2012 14:33:33 +0100 |
| Subject: acpi_video: fix leaking PCI references |
| |
| From: Alan Cox <alan@linux.intel.com> |
| |
| commit cfb46f433a4da97c31780e08a259fac2cb6bd61f upstream. |
| |
| Signed-off-by: Alan Cox <alan@linux.intel.com> |
| Acked-by: Matthew Garrett <mjg@redhat.com> |
| Signed-off-by: Len Brown <len.brown@intel.com> |
| 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 |
| @@ -1732,6 +1732,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; |
| @@ -1744,10 +1745,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) |
