diff options
| author | Jaroslav Kysela <perex@suse.cz> | 2004-04-24 20:29:18 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2004-04-24 20:29:18 +0200 |
| commit | 774a86172c170f27092c0ce29312ffdd2f0de2f7 (patch) | |
| tree | c4c12d0e4960102d07c263d2c7331d242d45bda5 /sound | |
| parent | 7664d1ad8e4b2f35b69a107971d98601a1b9d6e6 (diff) | |
| download | history-774a86172c170f27092c0ce29312ffdd2f0de2f7.tar.gz | |
ALSA CVS update - Takashi Iwai <tiwai@suse.de>
Control Midlevel
- fixed the compilation without CONFIG_PM.
- fixed the return value of POWER ioctl.
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/control.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 43f58a0454fcdf..95e84dfe18597a 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -995,6 +995,7 @@ static int snd_ctl_subscribe_events(snd_ctl_file_t *file, int *ptr) return 0; } +#ifdef CONFIG_PM /* * change the power state */ @@ -1019,6 +1020,7 @@ static int snd_ctl_set_power_state(snd_card_t *card, unsigned int power_state) } return 0; } +#endif static int snd_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) @@ -1065,7 +1067,7 @@ static int snd_ctl_ioctl(struct inode *inode, struct file *file, #ifdef CONFIG_PM if (card->pm_suspend && card->pm_resume) { snd_power_lock(card); - snd_ctl_set_power_state(card, err); + err = snd_ctl_set_power_state(card, err); snd_power_unlock(card); } else #endif |