Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

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

diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index a7efe53..4fb6c4b 100644 (file)
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -721,7 +721,7 @@ static int open(struct tty_struct *tty, struct file *filp)
        unsigned long flags;
 
        line = tty->index;
-       if ((line < 0) || (line >= synclinkmp_device_count)) {
+       if (line >= synclinkmp_device_count) {
                printk("%s(%d): open with invalid line #%d.\n",
                        __FILE__,__LINE__,line);
                return -ENODEV;
@@ -3977,7 +3977,6 @@ static int __init synclinkmp_init(void)
 
        /* Initialize the tty_driver structure */
 
-       serial_driver->owner = THIS_MODULE;
        serial_driver->driver_name = "synclinkmp";
        serial_driver->name = "ttySLM";
        serial_driver->major = ttymajor;