rpms/kernel/devel linux-2.6-pciehp-update.patch,1.3,1.4
Matthew Garrett
mjg59 at fedoraproject.org
Tue Nov 4 15:02:49 UTC 2008
- Previous message (by thread): rpms/drupal-date/devel .cvsignore, 1.2, 1.3 drupal-date.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/drupal-views/devel .cvsignore, 1.2, 1.3 drupal-views.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mjg59
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22784
Modified Files:
linux-2.6-pciehp-update.patch
Log Message:
Avoid unnecessary delays in the other part of the resume pathway
linux-2.6-pciehp-update.patch:
Index: linux-2.6-pciehp-update.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-pciehp-update.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-pciehp-update.patch 4 Nov 2008 13:48:53 -0000 1.3
+++ linux-2.6-pciehp-update.patch 4 Nov 2008 15:02:19 -0000 1.4
@@ -1,6 +1,6 @@
diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp_core.c linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_core.c
--- vanilla-2.6.27/drivers/pci/hotplug/pciehp_core.c 2008-10-09 23:13:53.000000000 +0100
-+++ linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_core.c 2008-11-04 13:43:48.000000000 +0000
++++ linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_core.c 2008-11-04 13:53:53.000000000 +0000
@@ -41,6 +41,7 @@
int pciehp_poll_mode;
int pciehp_poll_time;
@@ -97,7 +97,7 @@
u8 status;
diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp_ctrl.c linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_ctrl.c
--- vanilla-2.6.27/drivers/pci/hotplug/pciehp_ctrl.c 2008-10-09 23:13:53.000000000 +0100
-+++ linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_ctrl.c 2008-11-04 13:38:40.000000000 +0000
++++ linux-2.6.27.noarch/drivers/pci/hotplug/pciehp_ctrl.c 2008-11-04 14:57:04.000000000 +0000
@@ -179,7 +179,8 @@
* before taking any action that relies on power having been
* removed from the slot/adapter.
@@ -108,9 +108,34 @@
if (PWR_LED(ctrl))
pslot->hpc_ops->green_led_off(pslot);
+@@ -284,16 +285,16 @@
+ }
+ }
+
+- /*
+- * After turning power off, we must wait for at least 1 second
+- * before taking any action that relies on power having been
+- * removed from the slot/adapter.
+- */
+- msleep(1000);
+-
+- if (PWR_LED(ctrl))
++ if (PWR_LED(ctrl)) {
++ /*
++ * After turning power off, we must wait for at least 1 second
++ * before taking any action that relies on power having been
++ * removed from the slot/adapter.
++ */
++ msleep(1000);
+ /* turn off Green LED */
+ p_slot->hpc_ops->green_led_off(p_slot);
++ }
+
+ return 0;
+ }
diff -ur vanilla-2.6.27/drivers/pci/hotplug/pciehp.h linux-2.6.27.noarch/drivers/pci/hotplug/pciehp.h
--- vanilla-2.6.27/drivers/pci/hotplug/pciehp.h 2008-10-09 23:13:53.000000000 +0100
-+++ linux-2.6.27.noarch/drivers/pci/hotplug/pciehp.h 2008-11-04 13:38:40.000000000 +0000
++++ linux-2.6.27.noarch/drivers/pci/hotplug/pciehp.h 2008-11-04 13:53:53.000000000 +0000
@@ -206,6 +206,10 @@
{
u32 flags = (OSC_PCI_EXPRESS_NATIVE_HP_CONTROL |
- Previous message (by thread): rpms/drupal-date/devel .cvsignore, 1.2, 1.3 drupal-date.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/drupal-views/devel .cvsignore, 1.2, 1.3 drupal-views.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list