Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 225230
b: refs/heads/master
c: f622691
h: refs/heads/master
v: v3
  • Loading branch information
Tomoya authored and David S. Miller committed Dec 22, 2010
1 parent 15addd6 commit cc4e642
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ee09b3c1cff0335137dc1b146488e4352f640f13
refs/heads/master: f622691c91cd1bb27d03a5caa8a43822572c62bc
14 changes: 8 additions & 6 deletions trunk/drivers/net/can/pch_can.c
Original file line number Diff line number Diff line change
Expand Up @@ -1078,15 +1078,17 @@ static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)

/* Save Tx buffer enable state */
for (i = PCH_TX_OBJ_START; i <= PCH_TX_OBJ_END; i++)
priv->tx_enable[i] = pch_can_get_rxtx_ir(priv, i, PCH_TX_IFREG);
priv->tx_enable[i - 1] = pch_can_get_rxtx_ir(priv, i,
PCH_TX_IFREG);

/* Disable all Transmit buffers */
pch_can_set_tx_all(priv, 0);

/* Save Rx buffer enable state */
for (i = PCH_RX_OBJ_START; i <= PCH_RX_OBJ_END; i++) {
priv->rx_enable[i] = pch_can_get_rxtx_ir(priv, i, PCH_RX_IFREG);
priv->rx_link[i] = pch_can_get_rx_buffer_link(priv, i);
priv->rx_enable[i - 1] = pch_can_get_rxtx_ir(priv, i,
PCH_RX_IFREG);
priv->rx_link[i - 1] = pch_can_get_rx_buffer_link(priv, i);
}

/* Disable all Receive buffers */
Expand Down Expand Up @@ -1139,15 +1141,15 @@ static int pch_can_resume(struct pci_dev *pdev)

/* Enabling the transmit buffer. */
for (i = PCH_TX_OBJ_START; i <= PCH_TX_OBJ_END; i++)
pch_can_set_rxtx(priv, i, priv->tx_enable[i], PCH_TX_IFREG);
pch_can_set_rxtx(priv, i, priv->tx_enable[i - 1], PCH_TX_IFREG);

/* Configuring the receive buffer and enabling them. */
for (i = PCH_RX_OBJ_START; i <= PCH_RX_OBJ_END; i++) {
/* Restore buffer link */
pch_can_set_rx_buffer_link(priv, i, priv->rx_link[i]);
pch_can_set_rx_buffer_link(priv, i, priv->rx_link[i - 1]);

/* Restore buffer enables */
pch_can_set_rxtx(priv, i, priv->rx_enable[i], PCH_RX_IFREG);
pch_can_set_rxtx(priv, i, priv->rx_enable[i - 1], PCH_RX_IFREG);
}

/* Enable CAN Interrupts */
Expand Down

0 comments on commit cc4e642

Please sign in to comment.