From patchwork Sun Jul 16 06:41:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 107861 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp3051614qge; Sat, 15 Jul 2017 23:41:59 -0700 (PDT) X-Received: by 10.84.178.129 with SMTP id z1mr23911354plb.260.1500187319342; Sat, 15 Jul 2017 23:41:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500187319; cv=none; d=google.com; s=arc-20160816; b=DlzxEv1QcxLlRRf8QPpU/MCviVHG19IVnP0XeIj6CVpMNvON6mmK+hEM5g24wppx7T X+4Rn5jLlQAn+/dsd2DI6H0k9sOuprANK05q5Qhb65mDCM/A7dl3nV5mVgEA1tmI4ueK dzKPzzQGRI56qjnP6NmLuDuLOnUpl5OfPws3kh7T+1ItZ82DPeSOMZHt3N+YsdrSR2/q Mb5Y1SsBmG2E9ng3wOe3eCPWGovvs8L1EbJTP2xhXzG8RkVpwR58MvLZxf1pJfyjMzPS /cCdk8J/u+Gblv3yS/FGBmRIemtMWVB1MZA2Vv46BCHXF+9AZRIhY6Z0s5WijqGRCYsY Y6BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=Tok4O1ZwcACWg/FvFq4AoueTasQAP0ZihjJt/oVZ6tk=; b=dp2Sy5dvO2EGKctNsKtLyqfprjqpNYXJRa1yojxqx6N2GONG7XEGOyadY2fWhrrF6s 6fGMXuxL5rLsuojEsgvU3WPzEU4bHUt/t9T4iI0c8WeYNHO+KyvkiToalIA89QFs/Wvb Q4QHVR7ePpox11LmjU8U0ntrLUZkUxFUUl6wF6t6h7i3m4v6aNMAIHpPbs7NbdDHPf6Q yk5B+jC8DzGWkoikBqXl7iW7kXtuaMozvmwz4di3ict+DvCd0qyS9Vo1SfpcdEjttNU7 FXeNDgilhIQkzRGvefYot/rQO1ZB9az1n8O6cnXhJUpB/GlSjyPVX1rBwA7xO9dHtEOd l4zQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=LBm5fRE8; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (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 d197si667778pfd.433.2017.07.15.23.41.59; Sat, 15 Jul 2017 23:41:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=LBm5fRE8; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751223AbdGPGl6 (ORCPT + 10 others); Sun, 16 Jul 2017 02:41:58 -0400 Received: from mail-pg0-f42.google.com ([74.125.83.42]:34295 "EHLO mail-pg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751211AbdGPGl5 (ORCPT ); Sun, 16 Jul 2017 02:41:57 -0400 Received: by mail-pg0-f42.google.com with SMTP id t186so64334108pgb.1 for ; Sat, 15 Jul 2017 23:41:57 -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; bh=reoU3j+OkLiKd0WioZU7oEExYEuEXvEvRRrD9DWjNs0=; b=LBm5fRE8xigCN+SiJSVBeEAV/udm6TmLvHCjDVFb6vj+6a/hXNkbw2+xOQG3e906p6 hZ6CTOvv9iGlVM0IxjUX3v4m3qne+6ZYLL7PyiTYmL9nn0sooK8O3o7uysACZK2Obhne 0Nh24h2NgjXylX306i5VH15Pmk2uGPWXUuABI= 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; bh=reoU3j+OkLiKd0WioZU7oEExYEuEXvEvRRrD9DWjNs0=; b=cUpe4mHx0RmTG4US3yOMNdcdsxYLzb2iEjZzT67wJenN7HcyDUjE1UzjbZKaj/UJAA 0gMzJImR2MnOaexyIV4nL689zDFdJtPN4sUY3uKiEuglSUkjXsKSmAC/fmrtsq/wj3Al UK64ncr49IS+BDr7N2XmadSC0tLnwnPdsZuSTkcAFUJlFXv3ZGF/b27ETAj1arYUL7Rv jFyddApIinL2M1oET+g96fi1BsP9Z+/nkuVyZZxAF5hP9iPwjsuZYjIWzVF+Ofro7t2i 98NyvA4QXPFRMNQWbVIApWynPpph/4KpUdGqtYkeMTo52bQkIZ+B1+hYvtDNhuT7mk71 IXGA== X-Gm-Message-State: AIVw1133KL/lGudtw23Nv1c3yXTs2wUSr/xetq58HyydhAUytVdiCBVS sVaq5+KHcWC3NPno X-Received: by 10.99.4.3 with SMTP id 3mr406347pge.102.1500187316669; Sat, 15 Jul 2017 23:41:56 -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 b25sm2927782pfl.44.2017.07.15.23.41.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 15 Jul 2017 23:41:56 -0700 (PDT) From: Bjorn Andersson To: Stanimir Varbanov , Bjorn Helgaas Cc: linux-pci@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] PCI: qcom: Don't unroll init if init fails Date: Sat, 15 Jul 2017 23:41:53 -0700 Message-Id: <20170716064153.3346-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.12.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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)