From: Greg Kroah-Hartman Date: Thu, 14 Jun 2012 17:44:29 +0000 (-0700) Subject: 3.0-stable patches X-Git-Tag: v3.0.35~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d373c24227bbb14b2bbf0acf7c3909308b22b3c4;p=thirdparty%2Fkernel%2Fstable-queue.git 3.0-stable patches added patches: acpi_video-fix-leaking-pci-references.patch --- diff --git a/queue-3.0/acpi_video-fix-leaking-pci-references.patch b/queue-3.0/acpi_video-fix-leaking-pci-references.patch new file mode 100644 index 00000000000..189933fb046 --- /dev/null +++ b/queue-3.0/acpi_video-fix-leaking-pci-references.patch @@ -0,0 +1,41 @@ +From cfb46f433a4da97c31780e08a259fac2cb6bd61f Mon Sep 17 00:00:00 2001 +From: Alan Cox +Date: Wed, 25 Apr 2012 14:33:33 +0100 +Subject: acpi_video: fix leaking PCI references + +From: Alan Cox + +commit cfb46f433a4da97c31780e08a259fac2cb6bd61f upstream. + +Signed-off-by: Alan Cox +Acked-by: Matthew Garrett +Signed-off-by: Len Brown +Signed-off-by: Greg Kroah-Hartman + +--- + 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) diff --git a/queue-3.0/series b/queue-3.0/series index 6c3ff4324a0..51cf7a9ec50 100644 --- a/queue-3.0/series +++ b/queue-3.0/series @@ -9,3 +9,4 @@ can-c_can-fix-bug-echo_skb-is-occupied-during-transmit.patch can-c_can-fix-an-interrupt-thrash-issue-with-c_can-driver.patch can-c_can-fix-race-condition-in-c_can_open.patch hwmon-fam15h_power-increase-output-resolution.patch +acpi_video-fix-leaking-pci-references.patch