diff options
author | Pavel Machek <pavel@ucw.cz> | 2005-09-03 18:56:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:15 -0400 |
commit | 829ca9a30a2ddb727981d80fabdbff2ea86bc9ea (patch) | |
tree | 044087fb18aa4b5f5bbd233f54f9eec3439ad6de /drivers/net/irda | |
parent | 7e958883bced7e435f5a76349e15684858d3477c (diff) |
[PATCH] swsusp: fix remaining u32 vs. pm_message_t confusion
Fix remaining bits of u32 vs. pm_message confusion. Should not break
anything.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/irda')
-rw-r--r-- | drivers/net/irda/vlsi_ir.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c index 006e4f575606..4be95398bac4 100644 --- a/drivers/net/irda/vlsi_ir.c +++ b/drivers/net/irda/vlsi_ir.c | |||
@@ -1749,11 +1749,6 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state) | |||
1749 | struct net_device *ndev = pci_get_drvdata(pdev); | 1749 | struct net_device *ndev = pci_get_drvdata(pdev); |
1750 | vlsi_irda_dev_t *idev; | 1750 | vlsi_irda_dev_t *idev; |
1751 | 1751 | ||
1752 | if (state < 1 || state > 3 ) { | ||
1753 | IRDA_ERROR("%s - %s: invalid pm state request: %u\n", | ||
1754 | __FUNCTION__, PCIDEV_NAME(pdev), state); | ||
1755 | return 0; | ||
1756 | } | ||
1757 | if (!ndev) { | 1752 | if (!ndev) { |
1758 | IRDA_ERROR("%s - %s: no netdevice \n", | 1753 | IRDA_ERROR("%s - %s: no netdevice \n", |
1759 | __FUNCTION__, PCIDEV_NAME(pdev)); | 1754 | __FUNCTION__, PCIDEV_NAME(pdev)); |
@@ -1781,7 +1776,7 @@ static int vlsi_irda_suspend(struct pci_dev *pdev, pm_message_t state) | |||
1781 | idev->new_baud = idev->baud; | 1776 | idev->new_baud = idev->baud; |
1782 | } | 1777 | } |
1783 | 1778 | ||
1784 | pci_set_power_state(pdev,state); | 1779 | pci_set_power_state(pdev, pci_choose_state(pdev, state)); |
1785 | pdev->current_state = state; | 1780 | pdev->current_state = state; |
1786 | idev->resume_ok = 1; | 1781 | idev->resume_ok = 1; |
1787 | up(&idev->sem); | 1782 | up(&idev->sem); |
@@ -1807,8 +1802,8 @@ static int vlsi_irda_resume(struct pci_dev *pdev) | |||
1807 | return 0; | 1802 | return 0; |
1808 | } | 1803 | } |
1809 | 1804 | ||
1810 | pci_set_power_state(pdev, 0); | 1805 | pci_set_power_state(pdev, PCI_D0); |
1811 | pdev->current_state = 0; | 1806 | pdev->current_state = PM_EVENT_ON; |
1812 | 1807 | ||
1813 | if (!idev->resume_ok) { | 1808 | if (!idev->resume_ok) { |
1814 | /* should be obsolete now - but used to happen due to: | 1809 | /* should be obsolete now - but used to happen due to: |