1 files changed, 7 insertions, 3 deletions

diff --git a/arch/m68k/emu/nfblock.c b/arch/m68k/emu/nfblock.c
index 38049357d6d3..40712e49381b 100644
--- a/arch/m68k/emu/nfblock.c
+++ b/arch/m68k/emu/nfblock.c
@@ -155,18 +155,22 @@ out:
 static int __init nfhd_init(void)
 {
         u32 blocks, bsize;
+        int ret;
         int i;
 
         nfhd_id = nf_get_id("XHDI");
         if (!nfhd_id)
                 return -ENODEV;
 
-        major_num = register_blkdev(major_num, "nfhd");
-        if (major_num <= 0) {
+        ret = register_blkdev(major_num, "nfhd");
+        if (ret < 0) {
                 pr_warn("nfhd: unable to get major number\n");
-                return major_num;
+                return ret;
         }
 
+        if (!major_num)
+                major_num = ret;
+
         for (i = NFHD_DEV_OFFSET; i < 24; i++) {
                 if (nfhd_get_capacity(i, 0, &blocks, &bsize))
                         continue;