From patchwork Thu Feb 16 20:33:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prahlad V X-Patchwork-Id: 9578345 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 21C4260244 for ; Thu, 16 Feb 2017 20:33:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 151D52866B for ; Thu, 16 Feb 2017 20:33:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 098632866F; Thu, 16 Feb 2017 20:33:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A70C92866B for ; Thu, 16 Feb 2017 20:33:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933238AbdBPUdt (ORCPT ); Thu, 16 Feb 2017 15:33:49 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:34823 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932740AbdBPUds (ORCPT ); Thu, 16 Feb 2017 15:33:48 -0500 Received: by mail-pg0-f65.google.com with SMTP id y6so1748550pgy.2; Thu, 16 Feb 2017 12:33:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=/L9H27lc06xYaZuNdsFhccgbuiRK7Rnwy3gUROErpks=; b=LQiEugM+9tjFJZ8oaYyqdzQQq2AgqWbh6nb4KB43UCGqFsfvGFaBFgzTLfQ7rGRxn6 X0FbVXHvNdSo/XJPtGM9kvRBJ7JHGQnJy+rqPKwPrbhgeyA0Yoc0Yu4vW2ibkjPgYamY 7afTlGayzjqztUfzI8WyxssCo8oDwmplbN1BfolCByRpeg80Tf9Zu7XT+je9ZCMFQW0y Dwx0BsgU+WTeR1rs+GRD48veVdvBNXN7szPD+pT1OHaEaiYTXssC3FRdC+XdxTunHu7a 9xaGd0WQP60bL8EC5O2giG9iHjwN38wUB125haUeXyGiW5MU8ggA8q+W5XiA7XBxfZ8m i2bA== 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=/L9H27lc06xYaZuNdsFhccgbuiRK7Rnwy3gUROErpks=; b=QSk863574iXPHdvcHDxYLoNG3DDSidco4cWlajRyUAnc1BAslpqfMkTLYYjOaaRk18 MU9iwAvVumSQmPjYQVM6EygbAlRTlBapChh47WJpRmklweBZbtCHrAKZ4CE2ptUi1ynj 1DR87JX+OR6/er3a0zhhaIWTEDtTcId6WDpHd9Cl/dWu9aG/HFEZ9LewxQcMxBmzuSQR a1YBmu/kp1WGuTefun7FRjMkGZ3/7PMVJo1m53nkeo5FrqjNLXzT2uFcggAxEzB9Hrae pXtVzI8KD3G51RY2hfBY9duQm+lbaBrr9RksuKDebRGJF65yYpS+fA9xfzzyzZVDeFMi 60JQ== X-Gm-Message-State: AMke39kn7W9SiZwoPjpGxcIDkmbqIBHQBvBNhvHXvvVR4knDnoSUqS3F4ifffQY4fEfSog== X-Received: by 10.99.158.69 with SMTP id r5mr5247103pgo.153.1487277227439; Thu, 16 Feb 2017 12:33:47 -0800 (PST) Received: from localhost.localdomain.localdomain ([106.51.139.154]) by smtp.gmail.com with ESMTPSA id p25sm15308380pfd.0.2017.02.16.12.33.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Feb 2017 12:33:46 -0800 (PST) From: Prahlad V To: broonie@kernel.org Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Prahlad V Subject: [PATCH] spi: ti-qspi: revise ti_qspi_probe() failure flow Date: Fri, 17 Feb 2017 02:03:35 +0530 Message-Id: <20170216203335.27182-1-prahlad.eee@gmail.com> X-Mailer: git-send-email 2.9.2.729.ga42d7b6 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP call spi_master_put() in case of failures after spi_alloc_master(). call pm_runtime_disable() in case of failures after pm_runtime_enable(). Signed-off-by: Prahlad V --- drivers/spi/spi-ti-qspi.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-ti-qspi.c b/drivers/spi/spi-ti-qspi.c index ec6fb09..e784d0f 100644 --- a/drivers/spi/spi-ti-qspi.c +++ b/drivers/spi/spi-ti-qspi.c @@ -652,7 +652,8 @@ static int ti_qspi_probe(struct platform_device *pdev) r = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (r == NULL) { dev_err(&pdev->dev, "missing platform data\n"); - return -ENODEV; + ret = -ENODEV; + goto free_master; } } @@ -669,7 +670,8 @@ static int ti_qspi_probe(struct platform_device *pdev) irq = platform_get_irq(pdev, 0); if (irq < 0) { dev_err(&pdev->dev, "no irq resource?\n"); - return irq; + ret = irq; + goto free_master; } mutex_init(&qspi->list_lock); @@ -685,15 +687,17 @@ static int ti_qspi_probe(struct platform_device *pdev) qspi->ctrl_base = syscon_regmap_lookup_by_phandle(np, "syscon-chipselects"); - if (IS_ERR(qspi->ctrl_base)) - return PTR_ERR(qspi->ctrl_base); + if (IS_ERR(qspi->ctrl_base)) { + ret = PTR_ERR(qspi->ctrl_base); + goto free_master; + } ret = of_property_read_u32_index(np, "syscon-chipselects", 1, &qspi->ctrl_reg); if (ret) { dev_err(&pdev->dev, "couldn't get ctrl_mod reg index\n"); - return ret; + goto free_master; } } @@ -742,6 +746,7 @@ static int ti_qspi_probe(struct platform_device *pdev) if (!ret) return 0; + pm_runtime_disable(&pdev->dev); free_master: spi_master_put(master); return ret;