1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 0f45b7884a2c..13bfd5dcffce 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -2083,7 +2083,7 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
         mutex_lock(&port->mutex);
 
         tty_dev = device_find_child(uport->dev, &match, serial_match_port);
-        if (device_may_wakeup(tty_dev)) {
+        if (tty_dev && device_may_wakeup(tty_dev)) {
                 if (!enable_irq_wake(uport->irq))
                         uport->irq_wake = 1;
                 put_device(tty_dev);
@@ -2782,7 +2782,7 @@ int uart_add_one_port(struct uart_driver *drv, struct uart_port *uport)
          * Register the port whether it's detected or not.  This allows
          * setserial to be used to alter this port's parameters.
          */
-        tty_dev = tty_port_register_device_attr(port, drv->tty_driver,
+        tty_dev = tty_port_register_device_attr_serdev(port, drv->tty_driver,
                         uport->line, uport->dev, port, uport->tty_groups);
         if (likely(!IS_ERR(tty_dev))) {
                 device_set_wakeup_capable(tty_dev, 1);
@@ -2845,7 +2845,7 @@ int uart_remove_one_port(struct uart_driver *drv, struct uart_port *uport)
         /*
          * Remove the devices from the tty layer
          */
-        tty_unregister_device(drv->tty_driver, uport->line);
+        tty_port_unregister_device(port, drv->tty_driver, uport->line);
 
         tty = tty_port_tty_get(port);
         if (tty) {