Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/mac80211/main.c

1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c
index 544f2e25d0e..6381a0282ee 100644
--- a/drivers/serial/suncore.c
+++ b/drivers/serial/suncore.c
@@ -55,7 +55,12 @@ EXPORT_SYMBOL(sunserial_unregister_minors);
 int sunserial_console_match(struct console *con, struct device_node *dp,
                             struct uart_driver *drv, int line, bool ignore_line)
 {
-        if (!con || of_console_device != dp)
+        if (!con)
+                return 0;
+
+        drv->cons = con;
+
+        if (of_console_device != dp)
                 return 0;
 
         if (!ignore_line) {
@@ -69,12 +74,10 @@ int sunserial_console_match(struct console *con, struct device_node *dp,
                         return 0;
         }
 
-        con->index = line;
-        drv->cons = con;
-
-        if (!console_set_on_cmdline)
+        if (!console_set_on_cmdline) {
+                con->index = line;
                 add_preferred_console(con->name, line, NULL);
-
+        }
         return 1;
 }
 EXPORT_SYMBOL(sunserial_console_match);