usb: cdc-acm: fix devices not unthrottled on open

[karo-tx-linux.git] / init / do_mounts.c

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 2974c8b3b351b4a15b38acca4478e4032fece9fa..42b0707c348108b98f6ce05ae1a98ad4f64a0e86 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -373,8 +373,8 @@ retry:
 #ifdef CONFIG_BLOCK
                __bdevname(ROOT_DEV, b);
 #endif
-               printk("VFS: Cannot open root device \"%s\" or %s\n",
-                               root_device_name, b);
+               printk("VFS: Cannot open root device \"%s\" or %s: error %d\n",
+                               root_device_name, b, err);
                printk("Please append a correct \"root=\" boot option; here are the available partitions:\n");
 
                printk_all_partitions();
@@ -472,7 +472,7 @@ void __init change_floppy(char *fmt, ...)
 void __init mount_root(void)
 {
 #ifdef CONFIG_ROOT_NFS
-       if (MAJOR(ROOT_DEV) == UNNAMED_MAJOR) {
+       if (ROOT_DEV == Root_NFS) {
                if (mount_nfs_root())
                        return;