Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752471AbbKSQIS (ORCPT ); Thu, 19 Nov 2015 11:08:18 -0500 Received: from mail-lf0-f44.google.com ([209.85.215.44]:33660 "EHLO mail-lf0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751158AbbKSQIR (ORCPT ); Thu, 19 Nov 2015 11:08:17 -0500 Message-ID: <564DF3EE.909@lightnvm.io> Date: Thu, 19 Nov 2015 17:08:14 +0100 From: Matias User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Wenwei Tao CC: linux-kernel@vger.kernel.org Subject: Re: [PATCH] lightnvm: fix wrong return value and remove nvme_free(dev) in nvm_init() References: <1447946632-4720-1-git-send-email-ww.tao0320@gmail.com> In-Reply-To: <1447946632-4720-1-git-send-email-ww.tao0320@gmail.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1356 Lines: 46 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 > --- > 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/