- patches.suse/slab-handle-memoryless-nodes-v2a.patch: Refresh.

[linux-flexiantxendom0-3.2.10.git] / drivers / staging / comedi / drivers / serial2002.c

diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index 82aa86e..db37dcd 100644 (file)
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -125,14 +125,9 @@ struct serial_data {
 
 static long tty_ioctl(struct file *f, unsigned op, unsigned long param)
 {
-#ifdef HAVE_UNLOCKED_IOCTL
-       if (f->f_op->unlocked_ioctl) {
+       if (f->f_op->unlocked_ioctl)
                return f->f_op->unlocked_ioctl(f, op, param);
-       }
-#endif
-       if (f->f_op->ioctl) {
-               return f->f_op->ioctl(f->f_dentry->d_inode, f, op, param);
-       }
+
        return -ENOSYS;
 }
 
@@ -409,8 +404,8 @@ static void serial_2002_open(struct comedi_device *dev)
        } else {
                struct config_t {
 
-                       int kind;
-                       int bits;
+                       short int kind;
+                       short int bits;
                        int min;
                        int max;
                };