Commit f5c7db1c authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' into upstream

parents e714d99c 8d3d35b4

drivers/net/myri10ge/myri10ge.c

+1 −1
Original line number Diff line number Diff line
@@ -2425,7 +2425,7 @@ static int myri10ge_resume(struct pci_dev *pdev) 
	}



	myri10ge_reset(mgp);

	myri10ge_dummy_rdma(mgp, mgp->tx.boundary != 4096);

	myri10ge_dummy_rdma(mgp, 1);



	/* Save configuration space to be restored if the

	 * nic resets due to a parity error */

drivers/net/sky2.c

+2 −3
Original line number Diff line number Diff line
@@ -238,6 +238,8 @@ static void sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) 
			if (hw->ports > 1)

				reg1 |= PCI_Y2_PHY2_COMA;

		}

		sky2_pci_write32(hw, PCI_DEV_REG1, reg1);

		udelay(100);



		if (hw->chip_id == CHIP_ID_YUKON_EC_U) {

			sky2_pci_write32(hw, PCI_DEV_REG3, 0);
@@ -247,9 +249,6 @@ static void sky2_set_power_state(struct sky2_hw *hw, pci_power_t state) 
			sky2_pci_write32(hw, PCI_DEV_REG5, 0);

		}



		sky2_pci_write32(hw, PCI_DEV_REG1, reg1);

		udelay(100);



		break;



	case PCI_D3hot: