nullb: fix error return code in null_init()

[ Upstream commit 30c516d750396c5f3ec9cb04c9e025c25e91495e ]

Fix to return error code -ENOMEM from the null_alloc_dev() error
handling case instead of 0, as done elsewhere in this function.

Fixes: 2984c8684f96 ("nullb: factor disk parameters")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c
index 8042c26ea9e6eb6c6d9558b32c3ac85f20ce909d..4d55af5c6e5b56c81bdc312990f3646240aef185 100644 (file)
--- a/drivers/block/null_blk.c
+++ b/drivers/block/null_blk.c
@@ -1985,8 +1985,10 @@ static int __init null_init(void)
 
        for (i = 0; i < nr_devices; i++) {
                dev = null_alloc_dev();
-               if (!dev)
+               if (!dev) {
+                       ret = -ENOMEM;
                        goto err_dev;
+               }
                ret = null_add_dev(dev);
                if (ret) {
                        null_free_dev(dev);