Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 480fc0db authored by Wenwei Tao's avatar Wenwei Tao Committed by Jens Axboe
Browse files

lightnvm: wrong return value and redundant free 



The return value should be non-zero under error conditions.
Remove nvme_free(dev) to avoid free dev more than once.

Signed-off-by: default avatarWenwei Tao <ww.tao0320@gmail.com>
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 54514aa4

drivers/lightnvm/core.c

+2 −4
Original line number Diff line number Diff line
@@ -222,14 +222,13 @@ static void nvm_free(struct nvm_dev *dev) 
static int nvm_init(struct nvm_dev *dev)

{

	struct nvmm_type *mt;

	int ret = 0;

	int ret = -EINVAL;



	if (!dev->q || !dev->ops)

		return -EINVAL;

		return ret;



	if (dev->ops->identity(dev->q, &dev->identity)) {

		pr_err("nvm: device could not be identified\n");

		ret = -EINVAL;

		goto err;

	}
@@ -275,7 +274,6 @@ static int nvm_init(struct nvm_dev *dev) 
			dev->nr_chnls);

	return 0;

err:

	nvm_free(dev);

	pr_err("nvm: failed to initialize nvm\n");

	return ret;

}