summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/video.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-04-25 14:33:33 +0100
committerLen Brown <len.brown@intel.com>2012-06-01 13:40:55 -0400
commitcfb46f433a4da97c31780e08a259fac2cb6bd61f (patch)
treedd95f70763c1cb01e35bb28ac0fe3877501d3d60 /drivers/acpi/video.c
parent76e10d158efb6d4516018846f60c2ab5501900bc (diff)
downloadlinux-cfb46f433a4da97c31780e08a259fac2cb6bd61f.tar.bz2
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/acpi/video.c')
-rw-r--r--drivers/acpi/video.c5
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)
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(void)
pci_read_config_dword(dev, 0xfc, &address);
if (!address)
continue;
- return 1;
+ i915 = 1;
}
#endif
- return 0;
+ return i915;
}
int acpi_video_register(void)