Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / drivers / tty / synclink_gt.c

diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 18b48cd..34b1a3c 100644 (file)
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -654,7 +654,7 @@ static int open(struct tty_struct *tty, struct file *filp)
        unsigned long flags;
 
        line = tty->index;
-       if ((line < 0) || (line >= slgt_device_count)) {
+       if (line >= slgt_device_count) {
                DBGERR(("%s: open with invalid line #%d.\n", driver_name, line));
                return -ENODEV;
        }
@@ -3795,7 +3795,6 @@ static int __init slgt_init(void)
 
        /* Initialize the tty_driver structure */
 
-       serial_driver->owner = THIS_MODULE;
        serial_driver->driver_name = tty_driver_name;
        serial_driver->name = tty_dev_prefix;
        serial_driver->major = ttymajor;
@@ -3924,7 +3923,7 @@ static void tdma_reset(struct slgt_info *info)
  */
 static void enable_loopback(struct slgt_info *info)
 {
-       /* SCR (serial control) BIT2=looopback enable */
+       /* SCR (serial control) BIT2=loopback enable */
        wr_reg16(info, SCR, (unsigned short)(rd_reg16(info, SCR) | BIT2));
 
        if (info->params.mode != MGSL_MODE_ASYNC) {