From patchwork Sun Jul 16 06:39:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 107860 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp3050253qge; Sat, 15 Jul 2017 23:40:04 -0700 (PDT) X-Received: by 10.84.229.78 with SMTP id d14mr24473417pln.212.1500187204675; Sat, 15 Jul 2017 23:40:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500187204; cv=none; d=google.com; s=arc-20160816; b=T2rGlPRufp63AlMPSbP/BhB3q2rKaAv2y8qX1BeGgJagi8o5ip8gufuBvEhz/KNbxS 1WijmoCuE6AoYF+XleI0IsS4TCq9fzTF5md9t5gA1teXsTe6gLenbozjgMEWf93SeFNj s53YdLnSjRyby+NaLq/eEXlPGUASwH3DM0ElilFa3oua6bP6vNgACKVduBsgI50S6uf1 +D47oGM/UAUnBEzPUq5nkmrysg7T9APZTC44LVK8NEYO8ClFIXQGY34+d2y0sD9WOvfk O8PDlG5kdefTrBwGz3uTOmTqJwwhY92Y8WCLhshMZy9dI/tTb223VSP5hi+G8o55MmbE EePA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=reoU3j+OkLiKd0WioZU7oEExYEuEXvEvRRrD9DWjNs0=; b=FsBfOIdNEsiasISVxukm38bbCuB/hPWnIib4wcqVUmo95Yppv5nlwm2RKQJlROCnwW IEpyMHbCR5NX+HlZ0f7QKRjFBX8qIb3LSdd+AjQ7ubFd05cNk4pAd6jzfdhig9Kt/eZG 9QYnOLKt+6ErGrEdpXuipFvE61Pdg55kAKAE/FIlqNRlUF8tt00dBNm4wOJepxahQ0um bRyfo/64G9La9sWQsTq9qwuXDdsPxTDSo/dkhe8zGN/beDBCfEQHMSRbMRnQ7SUsFsTM KWK+XROGqgpkycLOtyI5+0DfFq5++VSpWU8agyATpNhiSaV+KP4F9N9TR7jT9JEE9Y/u w8GQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=ZUS/POGF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h7si1938175pgn.416.2017.07.15.23.40.04; Sat, 15 Jul 2017 23:40:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=ZUS/POGF; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751263AbdGPGj6 (ORCPT + 25 others); Sun, 16 Jul 2017 02:39:58 -0400 Received: from mail-pf0-f181.google.com ([209.85.192.181]:32909 "EHLO mail-pf0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751221AbdGPGjy (ORCPT ); Sun, 16 Jul 2017 02:39:54 -0400 Received: by mail-pf0-f181.google.com with SMTP id e7so62911311pfk.0 for ; Sat, 15 Jul 2017 23:39:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=reoU3j+OkLiKd0WioZU7oEExYEuEXvEvRRrD9DWjNs0=; b=ZUS/POGFHgaZwXW43Q6Z9L02LFM+IlN2PvLLh7L6KddnZ7L6Y+B+ITrUY80hnm7pv9 M7UCyRlObJD8FCnQPnN6mRqms6ZzrCQpnP4ZNrswCpcVgJbL2nHS9Rxkbj+pszl9QH0s N/Ja64CIM6YYDZ5iN7AqInZmpiJUy3y4XOHZk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=reoU3j+OkLiKd0WioZU7oEExYEuEXvEvRRrD9DWjNs0=; b=Yydf81cXc3VpBatzyQZ4D7CndBRABeE09JDLjtBOw9f1dlVou8gTK2050m1/o9m9/v 6YvZCifirNiUb/NmfFSrthWVtX0HJuPHpt1gXNJ2e98yJPeHfI1U1XrU4dYm0zTWYTIo 3C7i3736s8WZkVTR2LyNxTFwwPBMv/ntYwhagH7+YNL9psnimKxKE4d8bLFvg7CTM+nh /kN/f5rnHZs9y3iOY65l3Sfzln1VCrjB/FMzXFVNAgHcoqvgYbO5M9sRy/KXNqqdaMVm 22/oFGaP0N1GLHXV9q34Zl2/fx0Rga6j9ojZzUHVn+itecrnBcVYJ3yzqA3QBqbxA1BD 2ZCg== X-Gm-Message-State: AIVw111phyuzabjPW8sTc09Z/sXlqsBkXGcklBtD9GR3DABDkSjX7izM O5vMFyPVyCPFhPNi X-Received: by 10.99.173.70 with SMTP id y6mr23546583pgo.9.1500187193850; Sat, 15 Jul 2017 23:39:53 -0700 (PDT) Received: from localhost.localdomain (ip68-111-217-79.sd.sd.cox.net. [68.111.217.79]) by smtp.gmail.com with ESMTPSA id l8sm13391910pgs.30.2017.07.15.23.39.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Jul 2017 23:39:53 -0700 (PDT) From: Bjorn Andersson To: Stanimir Varbanov , Bjorn Helgaas Cc: linux-pci@vger.kernel.org (open list:PCIE DRIVER FOR QUALCOMM MSM), linux-arm-msm@vger.kernel.org (open list:PCIE DRIVER FOR QUALCOMM MSM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 2/3] PCI: qcom: Don't unroll init if init fails Date: Sat, 15 Jul 2017 23:39:46 -0700 Message-Id: <20170716063947.3272-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170716063947.3272-1-bjorn.andersson@linaro.org> References: <20170716063947.3272-1-bjorn.andersson@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When the init op fails it will restore the state of the resources, so we should not disable them one more time when this happens. Signed-off-by: Bjorn Andersson --- drivers/pci/dwc/pcie-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.12.0 diff --git a/drivers/pci/dwc/pcie-qcom.c b/drivers/pci/dwc/pcie-qcom.c index d15657dc3990..7b703741a3fd 100644 --- a/drivers/pci/dwc/pcie-qcom.c +++ b/drivers/pci/dwc/pcie-qcom.c @@ -901,7 +901,7 @@ static int qcom_pcie_host_init(struct pcie_port *pp) ret = pcie->ops->init(pcie); if (ret) - goto err_deinit; + return ret; ret = phy_power_on(pcie->phy); if (ret)