aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/8250.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/serial/8250.c')
-rw-r--r--drivers/serial/8250.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 0ae9ced00ed4..8d7ef69312a5 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1949,6 +1949,8 @@ static int serial8250_request_std_resource(struct uart_8250_port *up)
1949 case UPIO_AU: 1949 case UPIO_AU:
1950 size = 0x100000; 1950 size = 0x100000;
1951 /* fall thru */ 1951 /* fall thru */
1952 case UPIO_TSI:
1953 case UPIO_MEM32:
1952 case UPIO_MEM: 1954 case UPIO_MEM:
1953 if (!up->port.mapbase) 1955 if (!up->port.mapbase)
1954 break; 1956 break;
@@ -1984,6 +1986,8 @@ static void serial8250_release_std_resource(struct uart_8250_port *up)
1984 case UPIO_AU: 1986 case UPIO_AU:
1985 size = 0x100000; 1987 size = 0x100000;
1986 /* fall thru */ 1988 /* fall thru */
1989 case UPIO_TSI:
1990 case UPIO_MEM32:
1987 case UPIO_MEM: 1991 case UPIO_MEM:
1988 if (!up->port.mapbase) 1992 if (!up->port.mapbase)
1989 break; 1993 break;
@@ -2007,17 +2011,15 @@ static int serial8250_request_rsa_resource(struct uart_8250_port *up)
2007{ 2011{
2008 unsigned long start = UART_RSA_BASE << up->port.regshift; 2012 unsigned long start = UART_RSA_BASE << up->port.regshift;
2009 unsigned int size = 8 << up->port.regshift; 2013 unsigned int size = 8 << up->port.regshift;
2010 int ret = 0; 2014 int ret = -EINVAL;
2011 2015
2012 switch (up->port.iotype) { 2016 switch (up->port.iotype) {
2013 case UPIO_MEM:
2014 ret = -EINVAL;
2015 break;
2016
2017 case UPIO_HUB6: 2017 case UPIO_HUB6:
2018 case UPIO_PORT: 2018 case UPIO_PORT:
2019 start += up->port.iobase; 2019 start += up->port.iobase;
2020 if (!request_region(start, size, "serial-rsa")) 2020 if (request_region(start, size, "serial-rsa"))
2021 ret = 0;
2022 else
2021 ret = -EBUSY; 2023 ret = -EBUSY;
2022 break; 2024 break;
2023 } 2025 }
@@ -2031,9 +2033,6 @@ static void serial8250_release_rsa_resource(struct uart_8250_port *up)
2031 unsigned int size = 8 << up->port.regshift; 2033 unsigned int size = 8 << up->port.regshift;
2032 2034
2033 switch (up->port.iotype) { 2035 switch (up->port.iotype) {
2034 case UPIO_MEM:
2035 break;
2036
2037 case UPIO_HUB6: 2036 case UPIO_HUB6:
2038 case UPIO_PORT: 2037 case UPIO_PORT:
2039 release_region(up->port.iobase + offset, size); 2038 release_region(up->port.iobase + offset, size);