Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp1771871ybg; Sat, 19 Oct 2019 02:10:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqzXS9wo48VzfSVMK2WAKtMD2zY7y1pXxKY/2fOMtJWrdRgFzNFzSA3rkVumBTl2uJzDuFhX X-Received: by 2002:aa7:d304:: with SMTP id p4mr14105835edq.224.1571476242115; Sat, 19 Oct 2019 02:10:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571476242; cv=none; d=google.com; s=arc-20160816; b=rYD0ne1H5oIAVO7tdAoChF6CW5xEP+0icVKtMyV7j0LLJA29QZ2emq08YW4KKVfCH4 AUryTHt090aAGDIKCLnvkKmX1he+4afASoYfj3feiJk/q+qpyr5nHRC8ML1jp3jGv5w5 jcsxUMRB4lok1Mq7GfNfi87f7KeHgsqfdp2gi2YqflXjiE9i0sW7oTi8wrzPfjrPDb6X QkdC0CIuJC0kQK7ggo8eiImMAgrHLT3PrxafQv1c6tv3Ee2K6gsZkokmEWg6Dw4Srr86 k6YiAR0UlHPyqu7n3KkAo7AM5dm3HO60vbEW2TBvw8tevZHTkNNb5H61myxX84efMf+l +7Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=UVfCHj1tUoGfwTzzBfx1q3eOGqewOwobaB0opD/gZAo=; b=yUKSrsNO0mFXxx2HLCX/P/vZvBC3Ya1MuOFCnxuj7TBR7PkbxIc86cZF6zIEV6664H xeatfGD7tT6PV6wKbJPOwgEz4hexgNsJPJ5ER9yIHqBo0lUsIRY2OmyIyARRwTA1DRbw SPRRumqAf++xGTxJoRQpx6IMpvNCC1fjHSoFfnacxO1iW4j91vdXZImHDZn8KTmeA6QU xRJjLW39zq7oRhtrjMd3ipRHddRxE3v8nWc4TT8LkyiwPu3cUJY0WKL+8AfuxlljeiPz HAZSu6lEvqShFHVfsOIrXCRiufBejy1ETmt4vWe/QPkBFn17gQahTwroqtiCJZ+scgM7 EuKg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q13si4925744eju.46.2019.10.19.02.10.18; Sat, 19 Oct 2019 02:10:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2443260AbfJRTMQ (ORCPT + 99 others); Fri, 18 Oct 2019 15:12:16 -0400 Received: from mga11.intel.com ([192.55.52.93]:51475 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439895AbfJRTMQ (ORCPT ); Fri, 18 Oct 2019 15:12:16 -0400 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Oct 2019 12:12:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.67,312,1566889200"; d="scan'208";a="200798058" Received: from iweiny-desk2.sc.intel.com ([10.3.52.157]) by orsmga006.jf.intel.com with ESMTP; 18 Oct 2019 12:12:15 -0700 Date: Fri, 18 Oct 2019 12:12:14 -0700 From: Ira Weiny To: Dan Carpenter Cc: Dan Williams , Vishal Verma , Dave Jiang , Keith Busch , "Rafael J. Wysocki" , Len Brown , Greg Kroah-Hartman , linux-nvdimm@lists.01.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] acpi/nfit: unlock on error in scrub_show() Message-ID: <20191018191214.GB10455@iweiny-DESK2.sc.intel.com> References: <20191018123534.GA6549@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191018123534.GA6549@mwanda> User-Agent: Mutt/1.11.1 (2018-12-01) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Oct 18, 2019 at 03:35:34PM +0300, Dan Carpenter wrote: > We change the locking in this function and forgot to update this error > path so we are accidentally still holding the "dev->lockdep_mutex". > > Fixes: 87a30e1f05d7 ("driver-core, libnvdimm: Let device subsystems add local lockdep coverage") > Signed-off-by: Dan Carpenter Reviewed-by: Ira Weiny > --- > drivers/acpi/nfit/core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c > index 1413324982f0..14e68f202f81 100644 > --- a/drivers/acpi/nfit/core.c > +++ b/drivers/acpi/nfit/core.c > @@ -1322,7 +1322,7 @@ static ssize_t scrub_show(struct device *dev, > nfit_device_lock(dev); > nd_desc = dev_get_drvdata(dev); > if (!nd_desc) { > - device_unlock(dev); > + nfit_device_unlock(dev); > return rc; > } > acpi_desc = to_acpi_desc(nd_desc); > -- > 2.20.1 >