diff options
author | Alan Cox <alan@linux.intel.com> | 2012-04-25 09:33:33 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2012-06-01 13:40:55 -0400 |
commit | cfb46f433a4da97c31780e08a259fac2cb6bd61f (patch) | |
tree | dd95f70763c1cb01e35bb28ac0fe3877501d3d60 /drivers | |
parent | 76e10d158efb6d4516018846f60c2ab5501900bc (diff) |
acpi_video: fix leaking PCI references
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/video.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index 9577b6fa2650..66e8f7333e9b 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
@@ -1745,6 +1745,7 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type) | |||
1745 | 1745 | ||
1746 | static int __init intel_opregion_present(void) | 1746 | static int __init intel_opregion_present(void) |
1747 | { | 1747 | { |
1748 | int i915 = 0; | ||
1748 | #if defined(CONFIG_DRM_I915) || defined(CONFIG_DRM_I915_MODULE) | 1749 | #if defined(CONFIG_DRM_I915) || defined(CONFIG_DRM_I915_MODULE) |
1749 | struct pci_dev *dev = NULL; | 1750 | struct pci_dev *dev = NULL; |
1750 | u32 address; | 1751 | u32 address; |
@@ -1757,10 +1758,10 @@ static int __init intel_opregion_present(void) | |||
1757 | pci_read_config_dword(dev, 0xfc, &address); | 1758 | pci_read_config_dword(dev, 0xfc, &address); |
1758 | if (!address) | 1759 | if (!address) |
1759 | continue; | 1760 | continue; |
1760 | return 1; | 1761 | i915 = 1; |
1761 | } | 1762 | } |
1762 | #endif | 1763 | #endif |
1763 | return 0; | 1764 | return i915; |
1764 | } | 1765 | } |
1765 | 1766 | ||
1766 | int acpi_video_register(void) | 1767 | int acpi_video_register(void) |