From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15119CA9EA0 for ; Fri, 18 Oct 2019 19:12:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED4FE2070B for ; Fri, 18 Oct 2019 19:12:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2443298AbfJRTMQ (ORCPT ); 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 >