From patchwork Mon Jan 2 20:29:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 38187 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4305031wrt; Mon, 2 Jan 2023 12:30:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXsQnMBipbbRCZqf7YTdnZyyBjhWv+DraY8yLAq+Pa4TH+8kogFY9jBqYS5lQA3GU7jyqh3q X-Received: by 2002:a17:906:a1d7:b0:7b5:911c:9b0f with SMTP id bx23-20020a170906a1d700b007b5911c9b0fmr8185484ejb.7.1672691459074; Mon, 02 Jan 2023 12:30:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672691459; cv=none; d=google.com; s=arc-20160816; b=n0kd6vdx4q0LB0smzwHa8NMR/Un9JUrgkCTLhXf1Ip6H7nVk9YZklKDw1jNtnV3ciK ac3zojhwMpceaMBsuxNsmAmYyB/KczNYtNKPx0sVoxXUbq7rBzYDvzA9iRgrg1FU8jCM KPlwBastvXWM5Rxi0avsJOFW8s4XTnIZ/af041J9sLWUgBdyCxqtTBtmX0KWBLP79UsI 3BdCmNk/WQ5cob4R7sFLWhT8cSk8WMQgFpYW5gWz76BxX17h0Pg220gJkvNULVdQAVT0 m2ZkZUh6IxsAxYfZInfACBuCAXuV6jD3OfgfV6XiUNk+wRMYkhOc5at1WRt1Sx0ZAk7B yjnA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=gQiJDONxlqo0qG6x+vunmt9ct1u3wo6H9DMtw2Nx+uo=; b=sLp8RUqea9fmIdcez1O/OUs1tjF9JxXu+rGntgHIHthWGuFOnauMLPUiX3XPpn3J2v /yRGq5Jqf0B7Eo9ZueHTHWQ+CUCUlWAL0yolMQFmJLWSPB7pAKVy0fUNc6jGzbGEwoac opJt9+8TCoIrlXBJBxydscMYH7g1r06U8cFMkJibCzOECJRgKbceWCamgaovZY/L83dy cqmIKBYT67N5CxABhUrDvRGxz6yg2TY3EoXGLqVHiPQXDdO5Uc9OebCyN044SQU5kvqv ikBnXCsmm3ILybhgHGVevg73rRJYQxjZ6xCx+QI/2s+dhO7fAdUr3Q+FRbdVRZevGYls HbRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TJxhhaaz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dr6-20020a170907720600b007829f6fed9dsi24409630ejc.232.2023.01.02.12.30.35; Mon, 02 Jan 2023 12:30:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TJxhhaaz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233831AbjABU30 (ORCPT + 99 others); Mon, 2 Jan 2023 15:29:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233689AbjABU3H (ORCPT ); Mon, 2 Jan 2023 15:29:07 -0500 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADF45B7F2; Mon, 2 Jan 2023 12:29:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672691346; x=1704227346; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=qEdpGg42v8ssTX3MFNxTT74JRBUnoi0KLVf3ao4NExY=; b=TJxhhaaz4noZgwe1woo6KjgACjOqhWo0Am454D35KhCDsDeJOrdRcFar HcB0JK39hUzWM0ua7if2VYG1+BkD1lJcX7iYCK+ZWdIq7nRylHsn9PQmP wx8pIYGWAFUWpqHP6ae6lcLOEUrVWd1SY+Gs/pnRD+Q+QzCoDWRe8LDsp PMlRNJzSIGqnNhSY1KRj398LJYmea3uGOIFwod4+lJ+wlUlEE4J07mB3h PEMqhSuNQJN+3MdkVdUn3Y0KgZqcXmP9S1g8rTLSJCW6N/Dml+gSnIugA WEgQzUomzExwE4r3CSy5zweVHZMF/XVmZxyJ8N6tsc3tdo/kn7CED8lEv w==; X-IronPort-AV: E=McAfee;i="6500,9779,10578"; a="407798342" X-IronPort-AV: E=Sophos;i="5.96,295,1665471600"; d="scan'208";a="407798342" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jan 2023 12:29:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10578"; a="828649687" X-IronPort-AV: E=Sophos;i="5.96,295,1665471600"; d="scan'208";a="828649687" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 02 Jan 2023 12:29:04 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id C8B0EF4; Mon, 2 Jan 2023 22:29:36 +0200 (EET) From: Andy Shevchenko To: Heikki Krogerus , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Andy Shevchenko Subject: [PATCH v1 1/2] usb: typec: intel_pmc_mux: Don't leak the ACPI device reference count Date: Mon, 2 Jan 2023 22:29:32 +0200 Message-Id: <20230102202933.15968-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753944119182452996?= X-GMAIL-MSGID: =?utf-8?q?1753944119182452996?= When acpi_dev_get_memory_resources() fails, the reference count is left bumped. Drop it as it's done in the other error paths. Fixes: 43d596e32276 ("usb: typec: intel_pmc_mux: Check the port status before connect") Signed-off-by: Andy Shevchenko Reviewed-by: Heikki Krogerus --- drivers/usb/typec/mux/intel_pmc_mux.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c index fdbf3694e21f..87e2c9130607 100644 --- a/drivers/usb/typec/mux/intel_pmc_mux.c +++ b/drivers/usb/typec/mux/intel_pmc_mux.c @@ -614,8 +614,10 @@ static int pmc_usb_probe_iom(struct pmc_usb *pmc) INIT_LIST_HEAD(&resource_list); ret = acpi_dev_get_memory_resources(adev, &resource_list); - if (ret < 0) + if (ret < 0) { + acpi_dev_put(adev); return ret; + } rentry = list_first_entry_or_null(&resource_list, struct resource_entry, node); if (rentry) From patchwork Mon Jan 2 20:29:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 38186 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4304995wrt; Mon, 2 Jan 2023 12:30:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXsCSryI+4KDGxFVXzQUCP2p6mvFnajhNB0bgL0cPcqPb18y8sm4ERUjbasw66iB+dBFZUFx X-Received: by 2002:a17:906:8d03:b0:7c0:d52b:240 with SMTP id rv3-20020a1709068d0300b007c0d52b0240mr8025405ejc.4.1672691453043; Mon, 02 Jan 2023 12:30:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672691453; cv=none; d=google.com; s=arc-20160816; b=BuiL733rsW9RPdHapXOPoekkxMfIQSOuBPsQtI6p+Bk8wDcoakxqke2qshmFCex59O oU8jLctEP/n42yGJdwCEqcX/dYYkZqZNq3JC62atDv+Qa1Vf6cgfUenXS9dwgReqxQzA DKRb8+OgJA3Wfu8jho1ZZJKHPClIj4c6r0XkXk1Hf22Lgyx3r283MMKuTnABqSwFx1Ti U+wpal3PvTJ1B6b6BHrich6VZ0OYVUy9bJ25G32oH7bJeBc3iyWPApfrBEo7FBLAu1JO QXtwK6alzBCdGDLuQqSNeQqBNGxPhK7zvy+lQf+Ff5Oy3KXYVGN7UxPCK8UmYOWc3j1w ph1g== 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=xd2P4lH19tJwka+8CmAMAoWoqximnTeJE16UIpYTbVI=; b=yhXp2G89WMjcja+qVePfbLqJqDgm9vMJwC92nyzahuzQyuADRISfMrX8TrLSnEQFf8 YZYA4z28Eq+pnDLD7K461omumNIbvnSTNARXGTTwzZCDxXYxXtjoQaHK7AQ7SmUyB6jG tG5GSpMyeKPs1jy4Z6MbWnQiUHbVNOXheKaf45gu5fWZJozQJYY276sHTdRsGqyXT3Ue PxbXGHxlK3VB1aaQnIHA+yTmvZ3wWHx6UQ2yNQ6v6vmWBDtOMwsp9KlnIH+0T+SL7SZ2 NdAJUCtuOjzQda4QKBcf0pMjuDD/OVV4YWdkxhezRy5rmaOdkNIFzXyV5hCTeQvL2x86 dHQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QmhryEHs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id he30-20020a1709073d9e00b007c1247d65a8si26870739ejc.687.2023.01.02.12.30.29; Mon, 02 Jan 2023 12:30:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QmhryEHs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231314AbjABU3W (ORCPT + 99 others); Mon, 2 Jan 2023 15:29:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50352 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233748AbjABU3H (ORCPT ); Mon, 2 Jan 2023 15:29:07 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF8F0B7FB; Mon, 2 Jan 2023 12:29:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672691346; x=1704227346; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UhbpeqOPtdnvW1OoOYK7I6vcKWDvf7Orw5YO5zOikEU=; b=QmhryEHsAbrnVXZ6IcW5x/GBxWwyQeazHS2jIg+sG7jD2Sf+vAqPqXhy bUh0uUVgoyJWVP+UgaDr5a0B9An5km7OlVW3S5tesKmwX7BulS9xnvKFv aCoQlZ9EDRm748sTjzudmg1ColtEc5BzzzDkgKx+oftaLhjypuTHOORzM cR6PT8RLn4Dx9uzzZl4tb2aEvX+s31vcdUOGVsRx0/DPPar26ejZI7iwj qWPXs9KjBvZy+JTKzU1s/kiIp+YxMt8LOpE3gjiAt93khX2Ku4h3/Mke1 hTSfxB7T8pqyM7QyT35NQLl6+mskd+5wJ1LAJMWsEAv5sLvSMPN0jF1NU A==; X-IronPort-AV: E=McAfee;i="6500,9779,10578"; a="322772140" X-IronPort-AV: E=Sophos;i="5.96,295,1665471600"; d="scan'208";a="322772140" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jan 2023 12:29:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10578"; a="654577518" X-IronPort-AV: E=Sophos;i="5.96,295,1665471600"; d="scan'208";a="654577518" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga002.jf.intel.com with ESMTP; 02 Jan 2023 12:29:04 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id D614E84; Mon, 2 Jan 2023 22:29:36 +0200 (EET) From: Andy Shevchenko To: Heikki Krogerus , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , Andy Shevchenko Subject: [PATCH v1 2/2] usb: typec: intel_pmc_mux: Deduplicate ACPI matching in probe Date: Mon, 2 Jan 2023 22:29:33 +0200 Message-Id: <20230102202933.15968-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230102202933.15968-1-andriy.shevchenko@linux.intel.com> References: <20230102202933.15968-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753944113299175748?= X-GMAIL-MSGID: =?utf-8?q?1753944113299175748?= There is no need to call acpi_dev_present() followed by acpi_dev_get_first_match_dev() as they both do the same with only difference in the returning value. Instead, call the latter and check its result. Signed-off-by: Andy Shevchenko Reviewed-by: Heikki Krogerus --- drivers/usb/typec/mux/intel_pmc_mux.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c index 87e2c9130607..34e4188a40ff 100644 --- a/drivers/usb/typec/mux/intel_pmc_mux.c +++ b/drivers/usb/typec/mux/intel_pmc_mux.c @@ -602,16 +602,15 @@ static int pmc_usb_probe_iom(struct pmc_usb *pmc) int ret; for (dev_id = &iom_acpi_ids[0]; dev_id->id[0]; dev_id++) { - if (acpi_dev_present(dev_id->id, NULL, -1)) { - pmc->iom_port_status_offset = (u32)dev_id->driver_data; - adev = acpi_dev_get_first_match_dev(dev_id->id, NULL, -1); + adev = acpi_dev_get_first_match_dev(dev_id->id, NULL, -1); + if (adev) break; - } } - if (!adev) return -ENODEV; + pmc->iom_port_status_offset = (u32)dev_id->driver_data; + INIT_LIST_HEAD(&resource_list); ret = acpi_dev_get_memory_resources(adev, &resource_list); if (ret < 0) {