summaryrefslogtreecommitdiff
path: root/drivers/net/s2io.c
diff options
context:
space:
mode:
authorRamkrishna Vepa <ram.vepa@neterion.com>2007-07-25 19:40:33 -0700
committerJeff Garzik <jeff@garzik.org>2007-07-30 15:56:04 -0400
commit0a65a65d7ad6e2e647bc59844eb92829b0384b7d (patch)
tree7738662c10e031ccfcced83c8e5629ff8bd33faf /drivers/net/s2io.c
parent5b952a09140d1a9f432ae272a96727cb2b2bbcd8 (diff)
S2io: Fix crash when resetting adapter
- Removed the call to pci_set_power_state to reset the adapter as it was resulting in system crash on some platforms. (Resending; Removed HTML sections in the patch) Signed-off-by: Santosh Rastapur <santosh.rastapur@neterion.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r--drivers/net/s2io.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 5c0f80830939..9fd465b9f853 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3382,23 +3382,8 @@ static void s2io_reset(struct s2io_nic * sp)
/* Back up the PCI-X CMD reg, dont want to lose MMRBC, OST settings */
pci_read_config_word(sp->pdev, PCIX_COMMAND_REGISTER, &(pci_cmd));
- if (sp->device_type == XFRAME_II_DEVICE) {
- int ret;
- ret = pci_set_power_state(sp->pdev, 3);
- if (!ret)
- ret = pci_set_power_state(sp->pdev, 0);
- else {
- DBG_PRINT(ERR_DBG,"%s PME based SW_Reset failed!\n",
- __FUNCTION__);
- goto old_way;
- }
- msleep(20);
- goto new_way;
- }
-old_way:
val64 = SW_RESET_ALL;
writeq(val64, &bar0->sw_reset);
-new_way:
if (strstr(sp->product_name, "CX4")) {
msleep(750);
}