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 (file)
index 0000000..189933f
--- /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 <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)

diff --git a/queue-3.0/series b/queue-3.0/series
index 6c3ff4324a0b4c2ba2ae910c2377a3270b51b66f..51cf7a9ec50daa5acb82b8fb4afb3c0d05a927a6 100644 (file)
--- 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