Update of /cvsroot/alsa/alsa-kernel/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31740

Modified Files:
        control.c 
Log Message:
- fixed the compilation without CONFIG_PM.
- fixed the return value of POWER ioctl.


Index: control.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/core/control.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- control.c   8 Apr 2004 16:34:59 -0000       1.42
+++ control.c   16 Apr 2004 15:50:24 -0000      1.43
@@ -995,6 +995,7 @@
        return 0;
 }
 
+#ifdef CONFIG_PM
 /*
  * change the power state
  */
@@ -1019,6 +1020,7 @@
        }
        return 0;
 }
+#endif
 
 static int snd_ctl_ioctl(struct inode *inode, struct file *file,
                         unsigned int cmd, unsigned long arg)
@@ -1065,7 +1067,7 @@
 #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



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to