From nobody Fri Apr 3 17:38:35 2026 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 E9C25283FEA for ; Tue, 24 Mar 2026 05:20:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774329627; cv=none; b=Dvpm2czniT6J0tbJi3nib33Tsw46+2REm/6BElqObV1x/VeY/m7KYq+hzhpq8PvMMxXOoM5EI8Ui8dCmpgvej+rcQcwVP+O/AN8Y+KKgGhsJMBT2oEYcm+RiykYKK5ChTMUsqeSCsGG13JJmV4zHogi05dbBFbS59nJXyOSHmyY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774329627; c=relaxed/simple; bh=/AlhRTbtRWo7GbL2ds2v9wvogDNH5q6EjWRr3V3z/rc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IfVu2Tt5vsER3vrwokZroxEZRx0r0h+6Al85e4Y42aZY3QeTiTv/h/UO1iQXY4bEqJCj0OsGkTZH+j3j/bWvhe0wvL637OhYhxBQk8oDXPJKy09gNakRUukVeFmjTr/jeGJebIZXqFRp1Xyf7kCYkMP25webB78yojM1Mvy0dPU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=mpgiqkMk; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="mpgiqkMk" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-3590042fa8eso3213189a91.1 for ; Mon, 23 Mar 2026 22:20:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1774329625; x=1774934425; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zcsyifPwpw7PalUEgFntf8CIjQvjzcA0RCRU1Yc2FT4=; b=mpgiqkMk6AkzHkdJJfHxkQKgDj5RYp3+lqt0r/S+AlO0YvbfND26d2rMr+OA35XZUk ADosFyLE0L71XTMKbmJrwEzLDMpYCHIkY3XAO96u4uoHpNqFXk1651NN3dvDN/WgS2Yv AtV0FTc4znOZLSYFvLJ2GYaxz/gnlHillHQ68= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774329625; x=1774934425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zcsyifPwpw7PalUEgFntf8CIjQvjzcA0RCRU1Yc2FT4=; b=Qq4NuN887J4/VVYaOBnsaTuSg+RB+Z5GY3Nem9jdambtEfif0s8AuA78r3hAWPzVWf Dy71MerArVw/Xu7ctDoZvi4zULKFrypEe5kQ3XXWJOky1fX1IZ6LNY68HO0qDm6Yglc8 FbBJOAFngwF68FLfVnYt2KYoB19RVMUFqz4LGWjd93pKtV4msC8nZc+fctASW3cJlL0V YAI/dmTd41D435k1Vh4FcvZbZwnRuUwSqlnlzHq8n1RpZWrAU6jT7/fWk25nOp6lpnRV IFud51w6O16PdkRmrFNw7G4VlLRnRe1I3O4F6jHt+0aYcv9bNmQIdwudNNf5vzPgpevk 8nGw== X-Forwarded-Encrypted: i=1; AJvYcCVL1qaIBRzg2hCBDAx2qrh22UhvWZGF2POL0Mv6TACsPnYPsmaE+mYCwli8AKCt7JA3CwlcUWK2aX9OtCU=@vger.kernel.org X-Gm-Message-State: AOJu0YzDnM6/JMhKD3v+aW2ermuQztTpHEgQh5T4A3oGuA7gaJT7Uxco vofoA3OsNiNxHlP2fpWFevnx5R28/0hsoiamu2j8bviAZHF3D2AzNsKe15nE7irBDA== X-Gm-Gg: ATEYQzxTMrvzzwfK3v08572VCBottGxcZKAAxL26NfuJ1vnvpuJGDu6MLw4os7k8xya lGDWwe03sNTh2VHQB7xGXtwzABITjktApDkHcpfJ4Fiy7tYV0D77YXvM93Gqk41uyt4GLFZhfBl vzBaqc0KGsN54+IiE0bMzUGi0lTTQtYRd5EdIvk20hszSmfUHOqU4iZ9dVq19A+H6Sv9IPCdBHr DHjtlyHEycautDMnQW1pWMhV7qGAAEasoPaFL1vVtikIfswGj4zVF5HD1OSfy8I4X26/ALU0afZ kCbHl7qxOR6pKmElP4PJifuYFC4aejeReEbwSXm6h4J2VgKeqaiD9tR/N2Z1AO+ZScjiPrqSv9D jqBoafxHtY4XYn/JJAyIaCqK8/cScz92NinzsTaIqVf1UHvRhDAJJzOvX01hSWAyApaVjwHTqeQ r4Pjfdzt0jE3NN2yMeAT7mfc/CLoiMNtA2MU4b6HWSPdKPSq2V+joKUBwGRHoJP5SvxTjPC0rCC xqLBk+1sXuNA+WkpZg= X-Received: by 2002:a17:90b:510b:b0:35a:1b43:dff1 with SMTP id 98e67ed59e1d1-35bd2bf7926mr12662239a91.12.1774329625440; Mon, 23 Mar 2026 22:20:25 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:19a5:8f2f:d584:8078]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35c03124a87sm1068647a91.3.2026.03.23.22.20.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2026 22:20:24 -0700 (PDT) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno , Ryder Lee , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Bjorn Helgaas Cc: Chen-Yu Tsai , Bartosz Golaszewski , linux-pci@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v6 4/7] PCI: mediatek-gen3: Add error path for resume driver callbacks Date: Tue, 24 Mar 2026 13:19:56 +0800 Message-ID: <20260324052002.4072430-5-wenst@chromium.org> X-Mailer: git-send-email 2.53.0.983.g0bb29b3bc5-goog In-Reply-To: <20260324052002.4072430-1-wenst@chromium.org> References: <20260324052002.4072430-1-wenst@chromium.org> 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" The resume callback currently does teardown in the conditional block directly. This is going to get ugly when the pwrctrl calls are added. Move the teardown to a proper error cleanup path. Reviewed-by: AngeloGioacchino Del Regno Reviewed-by: Bartosz Golaszewski Reviewed-by: Manivannan Sadhasivam Signed-off-by: Chen-Yu Tsai --- drivers/pci/controller/pcie-mediatek-gen3.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/pcie-mediatek-gen3.c b/drivers/pci/cont= roller/pcie-mediatek-gen3.c index 1b6290f2c360..22a16e4ebc76 100644 --- a/drivers/pci/controller/pcie-mediatek-gen3.c +++ b/drivers/pci/controller/pcie-mediatek-gen3.c @@ -1304,14 +1304,16 @@ static int mtk_pcie_resume_noirq(struct device *dev) return err; =20 err =3D mtk_pcie_startup_port(pcie); - if (err) { - mtk_pcie_power_down(pcie); - return err; - } + if (err) + goto err_power_down; =20 mtk_pcie_irq_restore(pcie); =20 return 0; + +err_power_down: + mtk_pcie_power_down(pcie); + return err; } =20 static const struct dev_pm_ops mtk_pcie_pm_ops =3D { --=20 2.53.0.983.g0bb29b3bc5-goog