Style cleanups

[cp210x.git] / src / cp210x.c.karmic

diff --git a/src/cp210x.c.karmic b/src/cp210x.c.karmic
index 6188b8a47d01f794794ac35cdd8c35f7f4546a48..267ff4c8b50401b97d1ecc9592ccfc636ebe2d9c 100644 (file)
--- a/src/cp210x.c.karmic
+++ b/src/cp210x.c.karmic
@@ -269,23 +269,26 @@ static int make_usb_string(char *usbstr, size_t usblen, char *src,
  * is the size of the buffer at kbuf.
  * Returns the number of bytes used in kbuf.
  */
-static size_t cp210x_usbstr_from_user(char *kbuf, unsigned long ubuf, size_t klen)
+static size_t cp210x_usbstr_from_user(char *kbuf, unsigned long ubuf,
+               size_t klen)
 {
        struct cp210x_buffer t;
-       char* str;
+       char *str;
+       size_t slen;
 
        if (!kbuf || !ubuf || !klen)
                return 0;
        if (copy_from_user(&t, (struct cp210x_buffer __user *)ubuf, sizeof(t)))
                return 0;
-       if (!t.buf || !t.len)
+       if (!t.buf || !t.len || USBSTRLEN(t.len) > klen)
                return 0;
-       if (t.len < klen)
-               klen = t.len;
-       str = kbuf + klen - t.len;
-       if (copy_from_user(kbuf + klen - t.len, (u8 __user *)t.buf, klen))
+       slen = (klen - 2) / 2;
+       if (t.len < slen)
+               slen = t.len;
+       str = kbuf + klen - slen;
+       if (copy_from_user(str, (u8 __user *)t.buf, slen))
                return 0;
-       return make_usb_string(kbuf, klen, str, t.len);
+       return make_usb_string(kbuf, klen, str, slen);
 }
 
 /* cp210x_has_setmfg
@@ -312,7 +315,8 @@ static int cp210x_ctlmsg(struct usb_serial_port *port, u8 request,
        u8 *tbuf;
        int ret;
 
-       if (!(tbuf = kmalloc(size, GFP_KERNEL)))
+       tbuf = kmalloc(size, GFP_KERNEL);
+       if (!tbuf)
                return -ENOMEM;
        if (requestype & 0x80) {
                ret = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), request,
@@ -327,8 +331,9 @@ static int cp210x_ctlmsg(struct usb_serial_port *port, u8 request,
        }
        kfree(tbuf);
        if (ret < 0 && ret != -EPIPE) {
-               dev_printk(KERN_DEBUG, &dev->dev, "cp210x: control failed cmd rqt %u "
-                               "rq %u len %u ret %d\n", requestype, request, size, ret);
+               dev_printk(KERN_DEBUG, &dev->dev,
+                       "cp210x: ctl failed cmd rqt %u rq %u len %u ret %d\n",
+                       requestype, request, size, ret);
        }
        return ret;
 }
@@ -338,10 +343,10 @@ static int cp210x_reset(struct usb_serial_port *port)
        dbg("%s", __func__);
 
 #if 1
-       /* Is this better than usb_device_reset?  It may be.  Once a client issues
-        * the reset ioctl, it must disconnect and reconnect, since the USB
-        * connections are torn down.  We also ignore the error return, since
-        * the part resets and doesn't send one...
+       /* Is this better than usb_device_reset?  It may be.  Once a client
+        * issues the reset ioctl, it must disconnect and reconnect, since the
+        * USB connections are torn down.  We also ignore the error return,
+        * since the part resets and doesn't send one...
         */
        cp210x_ctlmsg(port, 0xff, 0x40, 0x0008, 0x00, NULL, 0);
 #else
@@ -456,7 +461,7 @@ static int cp210x_portconfset(struct usb_serial_port *port,
 
        memcpy(&lconfig, config, sizeof(lconfig));
 
-       /* Words from cp2103 are MSB */
+       /* Words from cp210x are MSB */
        lconfig.reset.mode = cpu_to_be16(config->reset.mode);
        lconfig.reset.latch = cpu_to_be16(config->reset.latch);
        lconfig.suspend.mode = cpu_to_be16(config->suspend.mode);
@@ -489,7 +494,7 @@ static int cp210x_portconfget(struct usb_serial_port *port,
        ret = cp210x_ctlmsg(port, 0xff, 0xc0, 0x370c, 0, config,
                        sizeof(struct cp210x_port_config));
        if (ret == sizeof(struct cp210x_port_config)) {
-               /* Words from cp2103 are MSB */
+               /* Words from cp210x are MSB */
                config->reset.mode = be16_to_cpu(config->reset.mode);
                config->reset.lowPower = be16_to_cpu(config->reset.lowPower);
                config->reset.latch = be16_to_cpu(config->reset.latch);
@@ -755,14 +760,14 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file,
                        return -EFAULT;
 
                /* this looks wrong: TIOCMSET isn't going to work right */
-               if (cp210x_tiocmset(tty, file, cmd==TIOCMBIC ? 0 : val,
-                                       cmd==TIOCMBIC ? val : 0))
+               if (cp210x_tiocmset(tty, file, (cmd == TIOCMBIC) ? 0 : val,
+                                       (cmd == TIOCMBIC) ? val : 0))
                        return -EFAULT;
                return 0;
        }
        break;
 
-       case IOCTL_GPIOGET:
+       case CP210x_IOCTL_GPIOGET:
        if (cp210x_get_partnum(port) == CP210x_PART_CP2103) {
                u8 gpio = 0;
                if (!cp210x_gpioget(port, &gpio) && !copy_to_user(
@@ -772,27 +777,28 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file,
        return -EFAULT;
        break;
 
-       case IOCTL_GPIOSET:
+       case CP210x_IOCTL_GPIOSET:
        if (cp210x_get_partnum(port) == CP210x_PART_CP2103 &&
                        !cp210x_gpioset(port, arg))
                return 0;
        return -EFAULT;
        break;
 
-       case IOCTL_GPIOBIC:
-       case IOCTL_GPIOBIS:
+       case CP210x_IOCTL_GPIOBIC:
+       case CP210x_IOCTL_GPIOBIS:
        if (cp210x_get_partnum(port) == CP210x_PART_CP2103 &&
-                       !cp210x_gpiosetb(port, (cmd==IOCTL_GPIOBIC) ?  0 : arg,
-                       (cmd==IOCTL_GPIOBIC) ? arg : 0))
+                       !cp210x_gpiosetb(port,
+                               (cmd == CP210x_IOCTL_GPIOBIC) ?  0 : arg,
+                               (cmd == CP210x_IOCTL_GPIOBIC) ? arg : 0))
                return 0;
        return -EFAULT;
        break;
 
-       case IOCTL_DEVICERESET:
+       case CP210x_IOCTL_DEVICERESET:
        return cp210x_reset(port);
        break;
 
-       case IOCTL_PORTCONFGET:
+       case CP210x_IOCTL_PORTCONFGET:
        {
                struct cp210x_port_config config;
                if (!cp210x_portconfget(port, &config) && !copy_to_user(
@@ -803,7 +809,7 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file,
        return -EFAULT;
        break;
 
-       case IOCTL_PORTCONFSET:
+       case CP210x_IOCTL_PORTCONFSET:
        {
        struct cp210x_port_config config;
        if (!copy_from_user(&config, (struct cp210x_port_config __user *)arg,
@@ -814,7 +820,7 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file,
        }
        break;
 
-       case IOCTL_SETVID:
+       case CP210x_IOCTL_SETVID:
        {
                unsigned int vid;
                if (!copy_from_user(&vid, (unsigned int __user *)arg,
@@ -825,7 +831,7 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file,
        }
        break;
 
-       case IOCTL_SETPID:
+       case CP210x_IOCTL_SETPID:
        {
                unsigned int pid;
                if (!copy_from_user(&pid, (unsigned int __user *)arg,
@@ -836,7 +842,7 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file,
        }
        break;
 
-       case IOCTL_SETMFG:
+       case CP210x_IOCTL_SETMFG:
        if (cp210x_has_setmfg()) {
                char usbstr[USBSTRLEN(CP210x_MAX_MFG_STRLEN)];
                size_t len = cp210x_usbstr_from_user(usbstr, arg,
@@ -847,7 +853,7 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file,
        return -EFAULT;
        break;
 
-       case IOCTL_SETPRODUCT:
+       case CP210x_IOCTL_SETPRODUCT:
        {
                char usbstr[USBSTRLEN(CP210x_MAX_PRODUCT_STRLEN)];
                size_t len = cp210x_usbstr_from_user(usbstr, arg,
@@ -858,7 +864,7 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file,
        }
        break;
 
-       case IOCTL_SETSERIAL:
+       case CP210x_IOCTL_SETSERIAL:
        {
                char usbstr[USBSTRLEN(CP210x_MAX_SERIAL_STRLEN)];
                size_t len = cp210x_usbstr_from_user(usbstr, arg,
@@ -869,7 +875,7 @@ static int cp210x_ioctl(struct tty_struct *tty, struct file *file,
        }
        break;
 
-       case IOCTL_SETDEVVER:
+       case CP210x_IOCTL_SETDEVVER:
        {
                unsigned int ver;
                if (!copy_from_user(&ver, (unsigned int __user *)arg,