Pull bugzilla-5764 into release branch
[sfrench/cifs-2.6.git] / drivers / net / netconsole.c
index 75b35ad760de3cf78fa7b3939a9902c301261731..bf58db29e2ed6342bd707931ccd598a3c376b07c 100644 (file)
@@ -87,6 +87,7 @@ static void write_msg(struct console *con, const char *msg, unsigned int len)
 }
 
 static struct console netconsole = {
+       .name = "netcon",
        .flags = CON_ENABLED | CON_PRINTBUFFER,
        .write = write_msg
 };
@@ -106,7 +107,7 @@ static int init_netconsole(void)
 
        if(!configured) {
                printk("netconsole: not configured, aborting\n");
-               return -EINVAL;
+               return 0;
        }
 
        if(netpoll_setup(&np))