Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364320
b: refs/heads/master
c: 5a65dcc
h: refs/heads/master
v: v3
  • Loading branch information
Federico Vaga authored and Greg Kroah-Hartman committed Apr 15, 2013
1 parent b1d4079 commit a072c45
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 579a00a5c2f0a85fb4602a53e2c1beb77a646528
refs/heads/master: 5a65dcc04cda41f4122aacc37a5a348454645399
4 changes: 4 additions & 0 deletions trunk/drivers/tty/serial/serial_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1941,6 +1941,8 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
mutex_unlock(&port->mutex);
return 0;
}
put_device(tty_dev);

if (console_suspend_enabled || !uart_console(uport))
uport->suspended = 1;

Expand Down Expand Up @@ -2006,9 +2008,11 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
disable_irq_wake(uport->irq);
uport->irq_wake = 0;
}
put_device(tty_dev);
mutex_unlock(&port->mutex);
return 0;
}
put_device(tty_dev);
uport->suspended = 0;

/*
Expand Down

0 comments on commit a072c45

Please sign in to comment.