From patchwork Fri Nov 20 12:47:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Matias_Bj=C3=B8rling?= X-Patchwork-Id: 7667641 X-Patchwork-Delegate: axboe@kernel.dk Return-Path: X-Original-To: patchwork-linux-block@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 77C8AC05CA for ; Fri, 20 Nov 2015 12:49:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 840A22041C for ; Fri, 20 Nov 2015 12:49:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ABEA62041A for ; Fri, 20 Nov 2015 12:49:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760171AbbKTMsG (ORCPT ); Fri, 20 Nov 2015 07:48:06 -0500 Received: from mail-wm0-f47.google.com ([74.125.82.47]:34614 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760148AbbKTMsF (ORCPT ); Fri, 20 Nov 2015 07:48:05 -0500 Received: by wmvv187 with SMTP id v187so70422204wmv.1 for ; Fri, 20 Nov 2015 04:48:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bjorling.me; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=xC00DE/EkFe5DGNq/msTzCErxEGJpKPdmMvpp9LmfZY=; b=RDjRT5dnMoS3jeTei7sqyWfq4yNGBXYO313rViGrOYF+pw3i/W1VgM1VljT9Ecp1vo F7dCSmJARgFjjq/AtIsOIlorw68kjLAlfbsdZlXtfHJAV99UEv39uUDkucYoO8KMGcx0 vzzZ/BMjRe8PU+KDllZpej1H2Co0Zx7yiOsKg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=xC00DE/EkFe5DGNq/msTzCErxEGJpKPdmMvpp9LmfZY=; b=cd1A8oMPTsNabM3N1/0+Ke5gxQVaIjPifxvMK+H716ZhpE08vfb9V95qyzgdgL4vxy RrRjjh+Ngig0IIlArT9o4zRUF///Pg0Qkh1kWMNXYrrRwE2UJHxAT6J1vIKh8MtnXFFW LxdxT3QsNzQbApG9ylBm7n3qcE+hVxXNlgQQIVcN03A792UI1sGUL2q/x+UBjNMHnWG9 vmo27EzpLgrUlxJSOMTO9Mf2tejaqV2/0Yqneo+6tKfP1DzLgDwo5tXNeYTpgv4eY3S+ 85Dcz9PZOP6uqesESHHJ2n+A0AN05q0V0eIYSWpl6tBsBpASEDMcw/kP+SpY96tHojoH g4ug== X-Gm-Message-State: ALoCoQnHWhxh4Q8QOodxuQ44YbqlNaS2AngUTLtm1iGZOIzBs+KyJdYetOra++TwSz97uHoUg2Zq X-Received: by 10.194.79.227 with SMTP id m3mr14418436wjx.123.1448023683747; Fri, 20 Nov 2015 04:48:03 -0800 (PST) Received: from localhost.localdomain (6164198-cl69.boa.fiberby.dk. [193.106.164.198]) by smtp.gmail.com with ESMTPSA id bh5sm12522435wjb.42.2015.11.20.04.48.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Nov 2015 04:48:03 -0800 (PST) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, axboe@fb.com Cc: Wenwei Tao , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 1/5] lightnvm: wrong return value and redundant free Date: Fri, 20 Nov 2015 13:47:53 +0100 Message-Id: <1448023677-22296-2-git-send-email-m@bjorling.me> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1448023677-22296-1-git-send-email-m@bjorling.me> References: <1448023677-22296-1-git-send-email-m@bjorling.me> MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wenwei Tao 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 Signed-off-by: Matias Bjørling --- 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 8a556f3..bed47e7 100644 --- a/drivers/lightnvm/core.c +++ b/drivers/lightnvm/core.c @@ -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; }