SOURCES (LINUX_2_6): linux-2.6-3Com_IBM-fix.patch - patching with ...

[pluto]

Author: pluto                        Date: Sun Jul 31 15:19:13 2005 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- patching with standard fuzz factor hurts.

---- Files affected:
SOURCES:
   linux-2.6-3Com_IBM-fix.patch (1.1.2.2 -> 1.1.2.3) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-3Com_IBM-fix.patch
diff -u SOURCES/linux-2.6-3Com_IBM-fix.patch:1.1.2.2 SOURCES/linux-2.6-3Com_IBM-fix.patch:1.1.2.3
--- SOURCES/linux-2.6-3Com_IBM-fix.patch:1.1.2.2	Sun Jul 31 15:02:51 2005
+++ SOURCES/linux-2.6-3Com_IBM-fix.patch	Sun Jul 31 17:19:08 2005
@@ -53,7 +53,7 @@
   * pci_set_power_state - Set the power state of a PCI device
   * @dev: PCI device to be suspended
   * @state: PCI power state (D0, D1, D2, D3hot, D3cold) we're entering
-@@ -239,7 +270,7 @@ pci_find_parent_resource(const struct pc
+@@ -239,7 +270,7 @@ int (*platform_pci_set_power_state)(stru
  int
  pci_set_power_state(struct pci_dev *dev, pci_power_t state)
  {
@@ -83,10 +83,11 @@
  		pmcsr &= ~PCI_PM_CTRL_STATE_MASK;
  		pmcsr |= state;
  	}
-@@ -301,6 +335,21 @@ pci_set_power_state(struct pci_dev *dev,
- 		udelay(200);
- 	dev->current_state = state;
+@@ -308,6 +342,22 @@ pci_set_power_state(struct pci_dev *dev,
+ 		platform_pci_set_power_state(dev, state);
  
+ 	dev->current_state = state;
++
 +	/* According to section 5.4.1 of the "PCI BUS POWER MANAGEMENT
 +	 * INTERFACE SPECIFICATION, REV. 1.2", a device transitioning
 +	 * from D3hot to D0 _may_ perform an internal reset, thereby
@@ -105,7 +106,7 @@
  	return 0;
  }
  
-@@ -795,6 +844,7 @@ struct pci_dev *isa_bridge;
+@@ -811,6 +861,7 @@ struct pci_dev *isa_bridge;
  EXPORT_SYMBOL(isa_bridge);
  #endif
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-3Com_IBM-fix.patch?r1=1.1.2.2&r2=1.1.2.3&f=u