3.4-stable patches

added patches:
	acpi_video-fix-leaking-pci-references.patch
	gma500-don-t-register-the-acpi-video-bus.patch

diff --git a/queue-3.4/acpi_video-fix-leaking-pci-references.patch b/queue-3.4/acpi_video-fix-leaking-pci-references.patch
new file mode 100644 (file)
index 0000000..f2cb07c
--- /dev/null
+++ b/queue-3.4/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
+@@ -1745,6 +1745,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;
+@@ -1757,10 +1758,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.4/gma500-don-t-register-the-acpi-video-bus.patch b/queue-3.4/gma500-don-t-register-the-acpi-video-bus.patch
new file mode 100644 (file)
index 0000000..a4bc8d5
--- /dev/null
+++ b/queue-3.4/gma500-don-t-register-the-acpi-video-bus.patch
@@ -0,0 +1,30 @@
+From 155689defc782b486a7e6776a57ecc4ebb37ed52 Mon Sep 17 00:00:00 2001
+From: Alan Cox <alan@linux.intel.com>
+Date: Wed, 25 Apr 2012 14:34:04 +0100
+Subject: gma500: don't register the ACPI video bus
+
+From: Alan Cox <alan@linux.intel.com>
+
+commit 155689defc782b486a7e6776a57ecc4ebb37ed52 upstream.
+
+We are not yet ready for this and it makes a mess on some devices.
+
+Signed-off-by: Alan Cox <alan@linux.intel.com>
+Signed-off-by: Len Brown <len.brown@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/gma500/psb_drv.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/gma500/psb_drv.c
++++ b/drivers/gpu/drm/gma500/psb_drv.c
+@@ -349,7 +349,7 @@ static int psb_driver_load(struct drm_de
+       PSB_WSGX32(0x30000000, PSB_CR_BIF_3D_REQ_BASE);
+ 
+ /*    igd_opregion_init(&dev_priv->opregion_dev); */
+-      acpi_video_register();
++/*    acpi_video_register(); */
+       if (dev_priv->lid_state)
+               psb_lid_timer_init(dev_priv);
+ 

diff --git a/queue-3.4/series b/queue-3.4/series
index 1c6054ac5abdcfb115520101652c196fc5900798..82c8b66a66cc0e0ff73aa3e1b965836afbd4880e 100644 (file)
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -33,3 +33,5 @@ net-sierra_net-device-ids-for-aircard-320u.patch
 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
+gma500-don-t-register-the-acpi-video-bus.patch
+acpi_video-fix-leaking-pci-references.patch