|
@@ -136,6 +136,11 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,
|
|
|
if (uport->type == PORT_UNKNOWN)
|
|
|
return 1;
|
|
|
|
|
|
+ /*
|
|
|
+ * Make sure the device is in D0 state.
|
|
|
+ */
|
|
|
+ uart_change_pm(state, UART_PM_STATE_ON);
|
|
|
+
|
|
|
/*
|
|
|
* Initialise and allocate the transmit and temporary
|
|
|
* buffer.
|
|
@@ -825,25 +830,29 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
|
|
|
* If we fail to request resources for the
|
|
|
* new port, try to restore the old settings.
|
|
|
*/
|
|
|
- if (retval && old_type != PORT_UNKNOWN) {
|
|
|
+ if (retval) {
|
|
|
uport->iobase = old_iobase;
|
|
|
uport->type = old_type;
|
|
|
uport->hub6 = old_hub6;
|
|
|
uport->iotype = old_iotype;
|
|
|
uport->regshift = old_shift;
|
|
|
uport->mapbase = old_mapbase;
|
|
|
- retval = uport->ops->request_port(uport);
|
|
|
- /*
|
|
|
- * If we failed to restore the old settings,
|
|
|
- * we fail like this.
|
|
|
- */
|
|
|
- if (retval)
|
|
|
- uport->type = PORT_UNKNOWN;
|
|
|
|
|
|
- /*
|
|
|
- * We failed anyway.
|
|
|
- */
|
|
|
- retval = -EBUSY;
|
|
|
+ if (old_type != PORT_UNKNOWN) {
|
|
|
+ retval = uport->ops->request_port(uport);
|
|
|
+ /*
|
|
|
+ * If we failed to restore the old settings,
|
|
|
+ * we fail like this.
|
|
|
+ */
|
|
|
+ if (retval)
|
|
|
+ uport->type = PORT_UNKNOWN;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * We failed anyway.
|
|
|
+ */
|
|
|
+ retval = -EBUSY;
|
|
|
+ }
|
|
|
+
|
|
|
/* Added to return the correct error -Ram Gupta */
|
|
|
goto exit;
|
|
|
}
|
|
@@ -1570,12 +1579,6 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
|
|
|
goto err_dec_count;
|
|
|
}
|
|
|
|
|
|
- /*
|
|
|
- * Make sure the device is in D0 state.
|
|
|
- */
|
|
|
- if (port->count == 1)
|
|
|
- uart_change_pm(state, UART_PM_STATE_ON);
|
|
|
-
|
|
|
/*
|
|
|
* Start up the serial port.
|
|
|
*/
|