mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Shawn Lin <shawn.lin@rock-chips.com>
To: Mark Brown <broonie@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org,
	Shawn Lin <shawn.lin@rock-chips.com>,
	Doug Anderson <dianders@chromium.org>,
	Dan Carpenter <dan.carpenter@oracle.com>
Subject: [PATCH] spi: rockchip: fix warning of static check
Date: Tue, 22 Mar 2016 19:36:14 +0800	[thread overview]
Message-ID: <1458646574-12830-1-git-send-email-shawn.lin@rock-chips.com> (raw)

Let's improve the check with -EPROBE_DEFER, otherwise
we may pass on null pointer to PTR_ERR. That causes the
static checker warning: passing zero to 'PTR_ERR'.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Doug Anderson <dianders@chromium.org>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
---

 drivers/spi/spi-rockchip.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index bfeb0d4..2cb36d9 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -726,20 +726,24 @@ static int rockchip_spi_probe(struct platform_device *pdev)
 	rs->dma_tx.ch = dma_request_slave_channel(rs->dev, "tx");
 	if (IS_ERR_OR_NULL(rs->dma_tx.ch)) {
 		/* Check tx to see if we need defer probing driver */
-		if (PTR_ERR(rs->dma_tx.ch) == -EPROBE_DEFER) {
+		if (rs->dma_tx.ch == ERR_PTR(-EPROBE_DEFER)) {
 			ret = -EPROBE_DEFER;
 			goto err_get_fifo_len;
 		}
 		dev_warn(rs->dev, "Failed to request TX DMA channel\n");
+		rs->dma_tx.ch = NULL;
 	}
 
 	rs->dma_rx.ch = dma_request_slave_channel(rs->dev, "rx");
-	if (!rs->dma_rx.ch) {
-		if (rs->dma_tx.ch) {
+	if (IS_ERR_OR_NULL(rs->dma_rx.ch)) {
+		if (rs->dma_tx.ch == ERR_PTR(-EPROBE_DEFER)) {
 			dma_release_channel(rs->dma_tx.ch);
 			rs->dma_tx.ch = NULL;
+			ret = -EPROBE_DEFER;
+			goto err_get_fifo_len;
 		}
 		dev_warn(rs->dev, "Failed to request RX DMA channel\n");
+		rs->dma_rx.ch = NULL;
 	}
 
 	if (rs->dma_tx.ch && rs->dma_rx.ch) {
-- 
2.3.7

             reply	other threads:[~2016-03-22 11:37 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-22 11:36 Shawn Lin [this message]
2016-03-22 12:56 ` Vladimir Zapolskiy
2016-03-22 13:00   ` Vladimir Zapolskiy
2016-03-22 16:23 ` Doug Anderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458646574-12830-1-git-send-email-shawn.lin@rock-chips.com \
    --to=shawn.lin@rock-chips.com \
    --cc=broonie@kernel.org \
    --cc=dan.carpenter@oracle.com \
    --cc=dianders@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®