Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / um / drivers / hostaudio_kern.c

diff --git a/arch/um/drivers/hostaudio_kern.c b/arch/um/drivers/hostaudio_kern.c
index 03282cc..37232f9 100644 (file)
--- a/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@ -35,7 +35,7 @@ char *mixer = HOSTAUDIO_DEV_MIXER;
 "    The default is \"" HOSTAUDIO_DEV_DSP "\".\n\n"
 
 #define MIXER_HELP \
-"    This is used to specify the host mixer device to the hostaudio driver.\n" \
+"    This is used to specify the host mixer device to the hostaudio driver.\n"\
 "    The default is \"" HOSTAUDIO_DEV_MIXER "\".\n\n"
 
 #ifndef MODULE
@@ -57,22 +57,22 @@ __uml_setup("mixer=", set_mixer, "mixer=<mixer device>\n" MIXER_HELP);
 
 #else /*MODULE*/
 
-MODULE_PARM(dsp, "s");
+module_param(dsp, charp, 0644);
 MODULE_PARM_DESC(dsp, DSP_HELP);
 
-MODULE_PARM(mixer, "s");
+module_param(mixer, charp, 0644);
 MODULE_PARM_DESC(mixer, MIXER_HELP);
 
 #endif
 
 /* /dev/dsp file operations */
 
-static ssize_t hostaudio_read(struct file *file, char *buffer, size_t count, 
-                             loff_t *ppos)
+static ssize_t hostaudio_read(struct file *file, char __user *buffer,
+                             size_t count, loff_t *ppos)
 {
         struct hostaudio_state *state = file->private_data;
        void *kbuf;
-       int ret;
+       int err;
 
 #ifdef DEBUG
         printk("hostaudio: read called, count = %d\n", count);
@@ -82,24 +82,24 @@ static ssize_t hostaudio_read(struct file *file, char *buffer, size_t count,
        if(kbuf == NULL)
                return(-ENOMEM);
 
-       ret = os_read_file(state->fd, kbuf, count);
-       if(ret < 0)
+       err = os_read_file(state->fd, kbuf, count);
+       if(err < 0)
                goto out;
 
-       if(copy_to_user(buffer, kbuf, ret))
-               ret = -EFAULT;
+       if(copy_to_user(buffer, kbuf, err))
+               err = -EFAULT;
 
  out:
        kfree(kbuf);
-       return(ret);
+       return(err);
 }
 
-static ssize_t hostaudio_write(struct file *file, const char *buffer, 
+static ssize_t hostaudio_write(struct file *file, const char __user *buffer,
                               size_t count, loff_t *ppos)
 {
         struct hostaudio_state *state = file->private_data;
        void *kbuf;
-       int ret;
+       int err;
 
 #ifdef DEBUG
         printk("hostaudio: write called, count = %d\n", count);
@@ -109,17 +109,18 @@ static ssize_t hostaudio_write(struct file *file, const char *buffer,
        if(kbuf == NULL)
                return(-ENOMEM);
 
-       ret = -EFAULT;
+       err = -EFAULT;
        if(copy_from_user(kbuf, buffer, count))
                goto out;
 
-       ret = os_write_file(state->fd, kbuf, count);
-       if(ret < 0)
+       err = os_write_file(state->fd, kbuf, count);
+       if(err < 0)
                goto out;
+       *ppos += err;
 
  out:
        kfree(kbuf);
-       return(ret);
+       return(err);
 }
 
 static unsigned int hostaudio_poll(struct file *file, 
@@ -139,7 +140,7 @@ static int hostaudio_ioctl(struct inode *inode, struct file *file,
 {
         struct hostaudio_state *state = file->private_data;
        unsigned long data = 0;
-       int ret;
+       int err;
 
 #ifdef DEBUG
         printk("hostaudio: ioctl called, cmd = %u\n", cmd);
@@ -151,14 +152,14 @@ static int hostaudio_ioctl(struct inode *inode, struct file *file,
        case SNDCTL_DSP_CHANNELS:
        case SNDCTL_DSP_SUBDIVIDE:
        case SNDCTL_DSP_SETFRAGMENT:
-               if(get_user(data, (int *) arg))
+               if(get_user(data, (int __user *) arg))
                        return(-EFAULT);
                break;
        default:
                break;
        }
 
-       ret = os_ioctl_generic(state->fd, cmd, (unsigned long) &data);
+       err = os_ioctl_generic(state->fd, cmd, (unsigned long) &data);
 
        switch(cmd){
        case SNDCTL_DSP_SPEED:
@@ -167,14 +168,14 @@ static int hostaudio_ioctl(struct inode *inode, struct file *file,
        case SNDCTL_DSP_CHANNELS:
        case SNDCTL_DSP_SUBDIVIDE:
        case SNDCTL_DSP_SETFRAGMENT:
-               if(put_user(data, (int *) arg))
+               if(put_user(data, (int __user *) arg))
                        return(-EFAULT);
                break;
        default:
                break;
        }
 
-       return(ret);
+       return(err);
 }
 
 static int hostaudio_open(struct inode *inode, struct file *file)
@@ -188,22 +189,19 @@ static int hostaudio_open(struct inode *inode, struct file *file)
 #endif
 
         state = kmalloc(sizeof(struct hostaudio_state), GFP_KERNEL);
-        if(state == NULL) return(-ENOMEM);
+        if(state == NULL)
+               return(-ENOMEM);
 
         if(file->f_mode & FMODE_READ) r = 1;
         if(file->f_mode & FMODE_WRITE) w = 1;
 
        ret = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0);
-
         if(ret < 0){
-               printk("hostaudio_open failed to open '%s', err = %d\n",
-                      dsp, -ret);
                kfree(state);
                return(ret);
         }
 
        state->fd = ret;
-
         file->private_data = state;
         return(0);
 }
@@ -216,11 +214,7 @@ static int hostaudio_release(struct inode *inode, struct file *file)
         printk("hostaudio: release called\n");
 #endif
 
-       if(state->fd >= 0){
                os_close_file(state->fd);
-               state->fd = -1;
-       }
-
         kfree(state);
 
        return(0);
@@ -265,8 +259,6 @@ static int hostmixer_open_mixdev(struct inode *inode, struct file *file)
                return(ret);
         }
 
-       state->fd = ret;
-
         file->private_data = state;
         return(0);
 }
@@ -279,10 +271,7 @@ static int hostmixer_release(struct inode *inode, struct file *file)
         printk("hostmixer: release called\n");
 #endif
 
-       if(state->fd >= 0){
                os_close_file(state->fd);
-               state->fd = -1;
-       }
         kfree(state);
 
        return(0);