From patchwork Mon Oct 2 16:16:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 147517 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1719375vqb; Mon, 2 Oct 2023 15:11:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFauiXFArn1OOD3vLsPcm34tm4Twlm/0ecTI+Uqf4wcFEUf51bEuIcTTWEMZXVGZVE39peH X-Received: by 2002:a17:902:c401:b0:1bc:8c6c:217d with SMTP id k1-20020a170902c40100b001bc8c6c217dmr12847337plk.61.1696284683985; Mon, 02 Oct 2023 15:11:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696284683; cv=none; d=google.com; s=arc-20160816; b=VN+v4MWNAZzHG4NfBtD0135ct3GL66LSXoiy85X1UWej/WF0acdogQUD5KphOTufIk qfSpJou4TnvpRxoMDct9q0V1cGQMcdK1WV/z8JYjoPltyEqAk4DDHNKG4c49mV58vwm0 YIa2nzCf7kB4o+XhaiOPwYlHEL4zcSVxwnyvjmfNP0Vv3lCnBf+14IjHwvass3rItnKP y4dEH2inUDaeF0pjZr5GNwf2Hp6VluB9CwNL/Iajrgjw+d45Rq+V/quyo0VRTDKDBMPs Jw349pD5Tg5ySNDPAyl028D+tTCAG8+GtP04DRdJkeQi0KrKyDZv9n7ykIwk3Q2Mxt6N d7Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uM1204m1KIHZyaf/KG1BFVyLP4sMoTfcrkSvH1otg4A=; fh=YYrWResMAxfU+C17BdM7l/WUXXvK87rdz5rOaZ9UMD0=; b=NMkw3PHuWPl31gXWFA6MTdg0BYvw2mMnD3k0+zJ1JJaTVVwfPk+kkPCq6NnS33ZDqZ U5EEHyq6pLMPYfhnpPB0T3pdOUsPRKJZ3QsT1iCcsVjet+a2b2nP6wqFFRtiLLYrKwi0 3hJmMayoBX3aWoguGoySM767eyV+jwlmbkQSuISWGLIPm0aiSsmb1ULrWJ+lLSUEPZ72 DYwgtezPzAhBcLFFiUgLcGdJVyfBD6dUzADggNZmYLqJtpZqroS4hd0fSAki83sM9PIH oBczDRGyaYzMrDx9cmAIWGCU1fTLyJmlvtnRreHySsFMoRDHx7huRlr+uKGapjgUuw30 PJGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mpbI92o1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id n3-20020a170902e54300b001c613b5e778si22400974plf.557.2023.10.02.15.11.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 15:11:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mpbI92o1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 72C8F802FD34; Mon, 2 Oct 2023 09:19:00 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238324AbjJBQS4 (ORCPT + 18 others); Mon, 2 Oct 2023 12:18:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38714 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238267AbjJBQSy (ORCPT ); Mon, 2 Oct 2023 12:18:54 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5E549E; Mon, 2 Oct 2023 09:18:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696263530; x=1727799530; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XhexIisAVKWahtWglpDt4hA3GcZPi6mztI8CxfJXXLo=; b=mpbI92o1F0vBH6TzmoruAHDR9PjY1ZGFByAbN+5dPXQ11bv2RaE0SGyj wi5LXaNXPfyXval2Kl7GV2txNcfoS92aih0QqoqbmO8NKpmDgKaIzU+2t W9aBZH6UmJfVoy3uOStc4S38g6fSo4LI2Z13ehYiFGmHUs4XGLQQlNf8O kqzbok6OUBeZnNb1MXCfAHBFp26iOWuLlhRCqHFYyIglwEFww22pWraBq 2BfGInaf6PrI1Bon7NcTvZjKGU00UMCXfh5ddyGOIHuVYMUMKPcSW3lN/ P9971Q+hosupLLhyWuOLr5it2y7CshVFTL0wlN5D3rsI0k1k+enEOAdn2 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="362949514" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="362949514" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 09:16:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="816339774" X-IronPort-AV: E=Sophos;i="6.03,194,1694761200"; d="scan'208";a="816339774" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 02 Oct 2023 09:16:21 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 47CFD14AF; Mon, 2 Oct 2023 19:16:20 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Mathias Nyman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mathias Nyman , Greg Kroah-Hartman Subject: [PATCH v1 05/10] xhci: dbc: Check for errors first in xhci_dbc_stop() Date: Mon, 2 Oct 2023 19:16:05 +0300 Message-Id: <20231002161610.2648818-5-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20231002161610.2648818-1-andriy.shevchenko@linux.intel.com> References: <20231002161610.2648818-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 02 Oct 2023 09:19:00 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778683408876964441 X-GMAIL-MSGID: 1778683408876964441 The usual patter is to check for errors and then continue if none. Apply that pattern to xhci_dbc_stop() code. Signed-off-by: Andy Shevchenko --- drivers/usb/host/xhci-dbgcap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/xhci-dbgcap.c b/drivers/usb/host/xhci-dbgcap.c index 3c90410e9cde..d110eb5f1625 100644 --- a/drivers/usb/host/xhci-dbgcap.c +++ b/drivers/usb/host/xhci-dbgcap.c @@ -646,11 +646,11 @@ static void xhci_dbc_stop(struct xhci_dbc *dbc) spin_lock_irqsave(&dbc->lock, flags); ret = xhci_do_dbc_stop(dbc); spin_unlock_irqrestore(&dbc->lock, flags); + if (ret) + return; - if (!ret) { - xhci_dbc_mem_cleanup(dbc); - pm_runtime_put_sync(dbc->dev); /* note, was self.controller */ - } + xhci_dbc_mem_cleanup(dbc); + pm_runtime_put_sync(dbc->dev); /* note, was self.controller */ } static void