This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / char / dtlk.c

diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index e8f15f4..8febd41 100644 (file)
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -85,9 +85,9 @@ static wait_queue_head_t dtlk_process_list;
 static struct timer_list dtlk_timer;
 
 /* prototypes for file_operations struct */
-static ssize_t dtlk_read(struct file *, char __user *,
+static ssize_t dtlk_read(struct file *, char *,
                         size_t nbytes, loff_t * ppos);
-static ssize_t dtlk_write(struct file *, const char __user *,
+static ssize_t dtlk_write(struct file *, const char *,
                          size_t nbytes, loff_t * ppos);
 static unsigned int dtlk_poll(struct file *, poll_table *);
 static int dtlk_open(struct inode *, struct file *);
@@ -121,13 +121,17 @@ static char dtlk_write_tts(char);
  */
 static void dtlk_timer_tick(unsigned long data);
 
-static ssize_t dtlk_read(struct file *file, char __user *buf,
+static ssize_t dtlk_read(struct file *file, char *buf,
                         size_t count, loff_t * ppos)
 {
        unsigned int minor = iminor(file->f_dentry->d_inode);
        char ch;
        int i = 0, retries;
 
+       /* Can't seek (pread) on the DoubleTalk.  */
+       if (ppos != &file->f_pos)
+               return -ESPIPE;
+
        TRACE_TEXT("(dtlk_read");
        /*  printk("DoubleTalk PC - dtlk_read()\n"); */
 
@@ -154,7 +158,7 @@ static ssize_t dtlk_read(struct file *file, char __user *buf,
        return -EAGAIN;
 }
 
-static ssize_t dtlk_write(struct file *file, const char __user *buf,
+static ssize_t dtlk_write(struct file *file, const char *buf,
                          size_t count, loff_t * ppos)
 {
        int i = 0, retries = 0, ch;
@@ -176,6 +180,10 @@ static ssize_t dtlk_write(struct file *file, const char __user *buf,
        }
 #endif
 
+       /* Can't seek (pwrite) on the DoubleTalk.  */
+       if (ppos != &file->f_pos)
+               return -ESPIPE;
+
        if (iminor(file->f_dentry->d_inode) != DTLK_MINOR)
                return -EINVAL;
 
@@ -269,7 +277,6 @@ static int dtlk_ioctl(struct inode *inode,
                      unsigned int cmd,
                      unsigned long arg)
 {
-       char __user *argp = (char __user *)arg;
        struct dtlk_settings *sp;
        char portval;
        TRACE_TEXT(" dtlk_ioctl");
@@ -278,13 +285,14 @@ static int dtlk_ioctl(struct inode *inode,
 
        case DTLK_INTERROGATE:
                sp = dtlk_interrogate();
-               if (copy_to_user(argp, sp, sizeof(struct dtlk_settings)))
+               if (copy_to_user((char *) arg, (char *) sp,
+                                  sizeof(struct dtlk_settings)))
                        return -EINVAL;
                return 0;
 
        case DTLK_STATUS:
                portval = inb_p(dtlk_port_tts);
-               return put_user(portval, argp);
+               return put_user(portval, (char *) arg);
 
        default:
                return -EINVAL;
@@ -295,12 +303,11 @@ static int dtlk_open(struct inode *inode, struct file *file)
 {
        TRACE_TEXT("(dtlk_open");
 
-       nonseekable_open(inode, file);
        switch (iminor(inode)) {
        case DTLK_MINOR:
                if (dtlk_busy)
                        return -EBUSY;
-               return nonseekable_open(inode, file);
+               return 0;
 
        default:
                return -ENXIO;