[alsa-cvslog] CVS: alsa-kernel/isa/wavefront wavefront_synth.c,1.15,1.16

[Jaroslav Kysela]

Update of /cvsroot/alsa/alsa-kernel/isa/wavefront
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19107/isa/wavefront

Modified Files:
        wavefront_synth.c 
Log Message:
2.6 kernel sync

Index: wavefront_synth.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/wavefront/wavefront_synth.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wavefront_synth.c   7 Apr 2004 17:48:15 -0000       1.15
+++ wavefront_synth.c   24 Apr 2004 14:57:27 -0000      1.16
@@ -1914,11 +1914,11 @@
        return (1);
 }
 
-#define __KERNEL_SYSCALLS__
 #include <linux/fs.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/unistd.h>
+#include <linux/syscalls.h>
 #include <asm/uaccess.h>
 
 static int errno;
@@ -1948,7 +1948,7 @@
        fs = get_fs();
        set_fs (get_ds());
 
-       if ((fd = open (path, 0, 0)) < 0) {
+       if ((fd = sys_open (path, 0, 0)) < 0) {
                snd_printk ("Unable to load \"%s\".\n",
                        path);
                return 1;
@@ -1957,7 +1957,7 @@
        while (1) {
                int x;
 
-               if ((x = read (fd, &section_length, sizeof (section_length))) !=
+               if ((x = sys_read (fd, &section_length, sizeof (section_length))) !=
                    sizeof (section_length)) {
                        snd_printk ("firmware read error.\n");
                        goto failure;
@@ -1967,7 +1967,7 @@
                        break;
                }
 
-               if (read (fd, section, section_length) != section_length) {
+               if (sys_read (fd, section, section_length) != section_length) {
                        snd_printk ("firmware section "
                                "read error.\n");
                        goto failure;
@@ -2006,12 +2006,12 @@
 
        }
 
-       close (fd);
+       sys_close (fd);
        set_fs (fs);
        return 0;
 
  failure:
-       close (fd);
+       sys_close (fd);
        set_fs (fs);
        snd_printk ("firmware download failed!!!\n");
        return 1;



-------------------------------------------------------
This SF.net email is sponsored by: The Robotic Monkeys at ThinkGeek
For a limited time only, get FREE Ground shipping on all orders of $35
or more. Hurry up and shop folks, this offer expires April 30th!
http://www.thinkgeek.com/freeshipping/?cpg=12297
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog