diff options
Diffstat (limited to 'drivers/tty/serial/68328serial.c')
-rw-r--r-- | drivers/tty/serial/68328serial.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c index cc4c092fef06..66c38a3f74ce 100644 --- a/drivers/tty/serial/68328serial.c +++ b/drivers/tty/serial/68328serial.c | |||
@@ -1189,12 +1189,6 @@ rs68328_init(void) | |||
1189 | serial_driver->flags = TTY_DRIVER_REAL_RAW; | 1189 | serial_driver->flags = TTY_DRIVER_REAL_RAW; |
1190 | tty_set_operations(serial_driver, &rs_ops); | 1190 | tty_set_operations(serial_driver, &rs_ops); |
1191 | 1191 | ||
1192 | if (tty_register_driver(serial_driver)) { | ||
1193 | put_tty_driver(serial_driver); | ||
1194 | printk(KERN_ERR "Couldn't register serial driver\n"); | ||
1195 | return -ENOMEM; | ||
1196 | } | ||
1197 | |||
1198 | local_irq_save(flags); | 1192 | local_irq_save(flags); |
1199 | 1193 | ||
1200 | for(i=0;i<NR_PORTS;i++) { | 1194 | for(i=0;i<NR_PORTS;i++) { |
@@ -1224,8 +1218,17 @@ rs68328_init(void) | |||
1224 | 0, | 1218 | 0, |
1225 | "M68328_UART", info)) | 1219 | "M68328_UART", info)) |
1226 | panic("Unable to attach 68328 serial interrupt\n"); | 1220 | panic("Unable to attach 68328 serial interrupt\n"); |
1221 | |||
1222 | tty_port_link_device(&info->tport, serial_driver, i); | ||
1227 | } | 1223 | } |
1228 | local_irq_restore(flags); | 1224 | local_irq_restore(flags); |
1225 | |||
1226 | if (tty_register_driver(serial_driver)) { | ||
1227 | put_tty_driver(serial_driver); | ||
1228 | printk(KERN_ERR "Couldn't register serial driver\n"); | ||
1229 | return -ENOMEM; | ||
1230 | } | ||
1231 | |||
1229 | return 0; | 1232 | return 0; |
1230 | } | 1233 | } |
1231 | 1234 | ||