Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1273253

Re: [PATCH] lightnvm: fix wrong return value and remove nvme_free(dev) in nvm_init()

Show all headers | View raw

On 11/19/2015 04:23 PM, Wenwei Tao wrote:
> The return value should be non-zero under error conditions.
> Remove nvme_free(dev) to avoid free dev more than once.
>
> Signed-off-by: Wenwei Tao <ww.tao0320@gmail.com>
> ---
>   drivers/lightnvm/core.c | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
> index f659e60..1942752 100644
> --- a/drivers/lightnvm/core.c
> +++ b/drivers/lightnvm/core.c
> @@ -220,14 +220,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;
>   	}
>
> @@ -273,7 +272,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;
>   }
>

Applied, Thanks Tao.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] lightnvm: fix wrong return value and remove nvme_free(dev) in nvm_init() Wenwei Tao <ww.tao0320@gmail.com> - 2015-11-19 16:30 +0100
  Re: [PATCH] lightnvm: fix wrong return value and remove nvme_free(dev)  in nvm_init() Matias <mb@lightnvm.io> - 2015-11-19 17:10 +0100

csiph-web