aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-07-07 20:56:40 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-07 21:23:43 -0400
commit2a569579be87b5ba61f9b6c54fd5f9f307c53962 (patch)
tree6cc12f2384d235e87941a85a925618c10b419c7f /sound/oss
parente8af300c3bd87b2310f1e7a642f37e0fe49a754b (diff)
[PATCH] pm: more u32 vs. pm_message_t fixes
Few more u32 vs. pm_message_t fixes. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/cs46xx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/cs46xx.c b/sound/oss/cs46xx.c
index 9e42a1a67ca4..cb998e8c0fdd 100644
--- a/sound/oss/cs46xx.c
+++ b/sound/oss/cs46xx.c
@@ -4174,7 +4174,7 @@ static int cs_ioctl_mixdev(struct inode *inode, struct file *file, unsigned int
4174 list_for_each(entry, &cs46xx_devs) 4174 list_for_each(entry, &cs46xx_devs)
4175 { 4175 {
4176 card = list_entry(entry, struct cs_card, list); 4176 card = list_entry(entry, struct cs_card, list);
4177 cs46xx_suspend(card, 0); 4177 cs46xx_suspend(card, PMSG_ON);
4178 } 4178 }
4179 4179
4180 } 4180 }
@@ -5749,7 +5749,7 @@ static int cs46xx_pm_callback(struct pm_dev *dev, pm_request_t rqst, void *data)
5749 case PM_SUSPEND: 5749 case PM_SUSPEND:
5750 CS_DBGOUT(CS_PM, 2, printk(KERN_INFO 5750 CS_DBGOUT(CS_PM, 2, printk(KERN_INFO
5751 "cs46xx: PM suspend request\n")); 5751 "cs46xx: PM suspend request\n"));
5752 if(cs46xx_suspend(card, 0)) 5752 if(cs46xx_suspend(card, PMSG_SUSPEND))
5753 { 5753 {
5754 CS_DBGOUT(CS_ERROR, 2, printk(KERN_INFO 5754 CS_DBGOUT(CS_ERROR, 2, printk(KERN_INFO
5755 "cs46xx: PM suspend request refused\n")); 5755 "cs46xx: PM suspend request refused\n"));
@@ -5779,7 +5779,7 @@ static int cs46xx_suspend_tbl(struct pci_dev *pcidev, pm_message_t state)
5779 struct cs_card *s = PCI_GET_DRIVER_DATA(pcidev); 5779 struct cs_card *s = PCI_GET_DRIVER_DATA(pcidev);
5780 CS_DBGOUT(CS_PM | CS_FUNCTION, 2, 5780 CS_DBGOUT(CS_PM | CS_FUNCTION, 2,
5781 printk(KERN_INFO "cs46xx: cs46xx_suspend_tbl request\n")); 5781 printk(KERN_INFO "cs46xx: cs46xx_suspend_tbl request\n"));
5782 cs46xx_suspend(s, 0); 5782 cs46xx_suspend(s, state);
5783 return 0; 5783 return 0;
5784} 5784}
5785 5785