Commit 92b0797e authored by Russell King's avatar Russell King

[SERIAL] Fix serial.h/serialP.h ordering nightmare.

Don't release NULL resources.
parent 8f3c0618
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
#include <linux/console.h> #include <linux/console.h>
#include <linux/sysrq.h> #include <linux/sysrq.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#include <linux/serialP.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/serialP.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -1635,7 +1635,7 @@ static void serial8250_config_port(struct uart_port *port, int flags) ...@@ -1635,7 +1635,7 @@ static void serial8250_config_port(struct uart_port *port, int flags)
if (up->port.type != PORT_RSA && res_rsa) if (up->port.type != PORT_RSA && res_rsa)
release_resource(res_rsa); release_resource(res_rsa);
if (up->port.type == PORT_UNKNOWN) if (up->port.type == PORT_UNKNOWN && res_std)
release_resource(res_std); release_resource(res_std);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment