From nobody Mon May 25 06:41:05 2026 Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A77BC250BF2 for ; Sun, 17 May 2026 14:29:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779028170; cv=none; b=Qx/bSBSHbFCFG9bpm8KkqCDCkzwBfr5EAZAwOw30LdeE6JmzwB+uapZRAe5y0qhvtReQt3MrBD2/9jp0qQiLcZQlcqixno0tgljw7pl81qSjYoYpHvpGMLwWN3uCyJxQUiMD6ubB9bXBasXC72/yo6CrVUtuhLxw+FGunBuQfgc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779028170; c=relaxed/simple; bh=/MX5myVN0aGQuXxb/u4PoxOWuLpM8OIhsF7656hciWU=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=gxdMT4l8j0Jshd8+yNsHwTi+Fjcwh4fA19rbTWFKDbfKagLYdxZrY/hvbkVhwmM+p4w4H19KhW0LCzcdGdy95BWclOPepYckAVYJA1mu7vJjGkqNIWVZ+Q1K35tT098yfrRNE6fyetou/g1+RQcb9JGtVrGSe8xdCZBt9Jr+SGI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=tDEyXcLw; arc=none smtp.client-ip=209.85.167.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tDEyXcLw" Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-479d593a0c3so1234469b6e.0 for ; Sun, 17 May 2026 07:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779028166; x=1779632966; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NloNbUZFkitLAyQNtcSD8UMdNtD346I37DRiF/RAGuc=; b=tDEyXcLwzkT0QLv1MA3ZWZucGxt8l17t+oDZzcnTVOZjCaKHkBZjNOSOVFQu8hipOP 0ECJFs5AhByFL07Rtwfo6Mq5s0oIHr7lEo0NX75TqQLxoWKW8dIFz/NZ7n026lUcu049 L1OnC3q0ET6Vt75PKBTxY0Si4jw2IOq2RIQvg1Y/GvF5Ag2HicOZ+rur2nsJGUFMPpGI HaKvMNB7EJ11tsH8kDSYKRsMdR9HQqAvruMawwoWn9gyse7qmwYEezWFUNOHKSrA0EDY wTWeIAcKQXwGpSovsqrm4m+3UMLkWy8yP1sZcNK6RKr38l1dtpEQOOPOwLBrj3YaC7fw ke4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779028166; x=1779632966; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=NloNbUZFkitLAyQNtcSD8UMdNtD346I37DRiF/RAGuc=; b=RPJwlSaQYM0MhpU57RcUSw1Nd315MfScSrBXlWgIcBbPF6/pWZEPHsM0hdy+WMfL2D Bb+pZrKcOVOv7MBygkVbIFUYC/ud/gqTT8kwhhq9fDwzcn59rB+1MNQ9rgubY03qKX9M vLh2wcmnuyK4YM524Xc1gUfPmuUa4KLI2mPMPRmBB370vB3fEivY5cUt8v37NFBOTcSN 1abSYxYKOLccl2vsoHVwW+IcBd/MR3f3c9LxBzQlZEt2BWumxlVHmMWCxaLnX1x2Un9I f71hg/XZcdl8EgD2bqmFeSL8ng1UpTIZjk5xjHumNNoPFhGBDP3c+Q/RTAGzAMfSeiNH C50w== X-Forwarded-Encrypted: i=1; AFNElJ/IAM0/oq3VYE6b+A5DahrPYhyzR2xzYHeNisqHHoYp0nPKBPLBauzTp6lUzdYSMUTeHFZEW8kdmsoUEUI=@vger.kernel.org X-Gm-Message-State: AOJu0YwIEhl1hy1yIaQbdSGy+kzVNTSHKq5F1g8TU/eSIms4EgQc2eHO uMkAmj9aa3suihYrgr9dZ0OeBAzdAKA9kVXwxPpiPOgvXfj6h//qqXVF X-Gm-Gg: Acq92OG5XZgesH2Kj515ivlELhXaJO659gOUDdfPvB4htRGNGUn911RcMlmsGylEWgN rTBUZMffazKl84lFskBX/6DibGYTlloCxnxqszadyiiaURkjRHv9WXqCwSOgxE1gR3V73lMSTaZ SjSclzMlQh2qKw8HmxZxiGmBeH7YdKrbdDNMVQcYXO0CTRpC5QkMYsLXoiLljelFqj4F7lHVZXJ N9YF2DIPbhCDD0URymLRgQFjg8Wctg8iYOpXGdk5nhnOrmsDbbFt7g2wdp7JfZyBCdpMzmli0Aw SI9NwkUWNeEhyyO8Cb5jJdHkBx75p93aKEi7665Glu6/lMQ2YARBNPhfRlvCAXZ7YqlRxeX0Wip SWIGOYVEqhiUAFC2sSti+geYLCXNYrFDs7lzm9s6im6Dps8OKGBmcYZZP91krXsmEmEqatjWoWG wYk35YuG+Xdo53Z6TDXUGOqzDycGJLvXQ2SIrLo0xK X-Received: by 2002:a05:6808:3008:b0:479:fad9:662b with SMTP id 5614622812f47-482cba918b7mr8135487b6e.24.1779028166192; Sun, 17 May 2026 07:29:26 -0700 (PDT) Received: from MacMini.lan ([172.127.162.94]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7e55b7c6b43sm5702701a34.5.2026.05.17.07.29.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 17 May 2026 07:29:25 -0700 (PDT) From: shayderrr To: andreas.noever@gmail.com, mika.westerberg@linux.intel.com, yehezkel.bernat@gmail.com Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Pranav Bajjuri Subject: [PATCH] thunderbolt: usb4-port: fix error path and sysfs alignment Date: Sun, 17 May 2026 09:29:23 -0500 Message-ID: <20260517142923.80585-1-darknessshayder@gmail.com> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Pranav Bajjuri Add missing return ERR_PTR(ret) after component_add() failure so PM setup is not reached on error, and fix argument alignment on offline_show(), offline_store(), and rescan_store(). Signed-off-by: Pranav Bajjuri --- drivers/thunderbolt/usb4_port.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/drivers/thunderbolt/usb4_port.c b/drivers/thunderbolt/usb4_por= t.c index c32d3516e780..2282e1ad0c45 100644 --- a/drivers/thunderbolt/usb4_port.c +++ b/drivers/thunderbolt/usb4_port.c @@ -34,8 +34,8 @@ static void connector_unbind(struct device *dev, struct d= evice *connector, void } =20 static const struct component_ops connector_ops =3D { - .bind =3D connector_bind, - .unbind =3D connector_unbind, + .bind =3D connector_bind, + .unbind =3D connector_unbind, }; =20 static ssize_t link_show(struct device *dev, struct device_attribute *attr, @@ -137,7 +137,6 @@ bool usb4_usb3_port_match(struct device *usb4_port_dev, if (IS_ERR(nhi_fwnode)) return false; =20 - /* Check if USB3 fwnode references same NHI where USB4 port resides */ if (!device_match_fwnode(&nhi->pdev->dev, nhi_fwnode)) return false; =20 @@ -179,7 +178,6 @@ static ssize_t offline_store(struct device *dev, if (val =3D=3D usb4->offline) goto out_unlock; =20 - /* Offline mode works only for ports that are not connected */ if (tb_port_has_remote(port)) { ret =3D -EBUSY; goto out_unlock; @@ -230,7 +228,6 @@ static ssize_t rescan_store(struct device *dev, goto out_rpm; } =20 - /* Must be in offline mode already */ if (!usb4->offline) { ret =3D -EINVAL; goto out_unlock; @@ -261,16 +258,12 @@ static umode_t service_attr_is_visible(struct kobject= *kobj, struct device *dev =3D kobj_to_dev(kobj); struct usb4_port *usb4 =3D tb_to_usb4_port_device(dev); =20 - /* - * Always need some platform help to cycle the modes so that - * retimers can be accessed through the sideband. - */ return usb4->can_offline ? attr->mode : 0; } =20 static const struct attribute_group service_group =3D { - .attrs =3D service_attrs, - .is_visible =3D service_attr_is_visible, + .attrs =3D service_attrs, + .is_visible =3D service_attr_is_visible, }; =20 static const struct attribute_group *usb4_port_device_groups[] =3D { @@ -282,14 +275,13 @@ static const struct attribute_group *usb4_port_device= _groups[] =3D { static void usb4_port_device_release(struct device *dev) { struct usb4_port *usb4 =3D container_of(dev, struct usb4_port, dev); - kfree(usb4); } =20 const struct device_type usb4_port_device_type =3D { - .name =3D "usb4_port", - .groups =3D usb4_port_device_groups, - .release =3D usb4_port_device_release, + .name =3D "usb4_port", + .groups =3D usb4_port_device_groups, + .release =3D usb4_port_device_release, }; =20 /** @@ -324,6 +316,7 @@ struct usb4_port *usb4_port_device_add(struct tb_port *= port) if (ret) { dev_err(&usb4->dev, "failed to add component\n"); device_unregister(&usb4->dev); + return ERR_PTR(ret); } =20 if (!tb_is_upstream_port(port)) --=20 2.50.1 (Apple Git-155)