aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda/vlsi_ir.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/irda/vlsi_ir.c')
-rw-r--r--drivers/net/irda/vlsi_ir.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index 4be95398bac4..6d9de626c967 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -1757,12 +1757,12 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
1757 idev = ndev->priv; 1757 idev = ndev->priv;
1758 down(&idev->sem); 1758 down(&idev->sem);
1759 if (pdev->current_state != 0) { /* already suspended */ 1759 if (pdev->current_state != 0) { /* already suspended */
1760 if (state > pdev->current_state) { /* simply go deeper */ 1760 if (state.event > pdev->current_state) { /* simply go deeper */
1761 pci_set_power_state(pdev,state); 1761 pci_set_power_state(pdev, pci_choose_state(pdev, state));
1762 pdev->current_state = state; 1762 pdev->current_state = state.event;
1763 } 1763 }
1764 else 1764 else
1765 IRDA_ERROR("%s - %s: invalid suspend request %u -> %u\n", __FUNCTION__, PCIDEV_NAME(pdev), pdev->current_state, state); 1765 IRDA_ERROR("%s - %s: invalid suspend request %u -> %u\n", __FUNCTION__, PCIDEV_NAME(pdev), pdev->current_state, state.event);
1766 up(&idev->sem); 1766 up(&idev->sem);
1767 return 0; 1767 return 0;
1768 } 1768 }
@@ -1777,7 +1777,7 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state)
1777 } 1777 }
1778 1778
1779 pci_set_power_state(pdev, pci_choose_state(pdev, state)); 1779 pci_set_power_state(pdev, pci_choose_state(pdev, state));
1780 pdev->current_state = state; 1780 pdev->current_state = state.event;
1781 idev->resume_ok = 1; 1781 idev->resume_ok = 1;
1782 up(&idev->sem); 1782 up(&idev->sem);
1783 return 0; 1783 return 0;