From patchwork Wed Jan 18 00:28:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 91720 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp768442qgi; Tue, 17 Jan 2017 16:35:55 -0800 (PST) X-Received: by 10.84.210.228 with SMTP id a91mr787414pli.0.1484699755270; Tue, 17 Jan 2017 16:35:55 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w127si4907710pgb.313.2017.01.17.16.35.54; Tue, 17 Jan 2017 16:35:55 -0800 (PST) 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; 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 S1751239AbdARAfx (ORCPT + 25 others); Tue, 17 Jan 2017 19:35:53 -0500 Received: from mail-lf0-f46.google.com ([209.85.215.46]:34393 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751159AbdARAfw (ORCPT ); Tue, 17 Jan 2017 19:35:52 -0500 Received: by mail-lf0-f46.google.com with SMTP id v186so121391644lfa.1 for ; Tue, 17 Jan 2017 16:35:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=YxN2nBNvO6xeE/JoYcU7o9hGOoscBai4+OVFwpZGqY4=; b=CXtEbTPJdFiuYycR1Ng1pHm0xhubeoUc6THIojuekE5xSHBF3ZM1ec/aS/xt9SkTzr aEaXYT01SkpS/YqXdFZ11ACBlFL5+hmx/N/xaP0/X8JXt2DBL1BElHBekm+U7LABb1ox S0yNaEjpyyU932CesePLzAhdH591n0hZah4G4= 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=YxN2nBNvO6xeE/JoYcU7o9hGOoscBai4+OVFwpZGqY4=; b=Wc1wP9zUmjwFifUUQgF8xxyYHK7l/pqU8f5QN+QZJqgrszjBW7u1q7ZwO2AOCI3F3h wvjR7LKvDFkvE0UxszO8+npIda8e1JPeNFBg8759dmBaqXoXFnSP1l4zVqenoEJOZd7g 3z37Ewvxgj1OtETON66+HK7Uiik0uMQIA5oCkpyeTPiJAVePvqpsIusQ4Yo+lgq1TG8Y X8bSmP24CkHbrq2pBIpHXvuoW6El4N92rNFuZTukSzPOmh+oESFr73v0JJifHK6XTLz6 jb/RuLV7RzfOyPOAAfQI0e79oqMBw1SyX1vfw5FRt72bKPMXwEwtrjHzGlEdI5pCQI+H HasA== X-Gm-Message-State: AIkVDXLwsR6iEIk8kLI4yEHeYUIVVZfn/bRTDov+0ulXV13uQ2d7iT5U+LbJ0e5y4Ki0MZgX X-Received: by 10.25.228.91 with SMTP id b88mr116110lfh.177.1484699289934; Tue, 17 Jan 2017 16:28:09 -0800 (PST) Received: from localhost.localdomain (183-224-132-95.pool.ukrtel.net. [95.132.224.183]) by smtp.gmail.com with ESMTPSA id s63sm8127300lja.49.2017.01.17.16.28.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 16:28:09 -0800 (PST) From: Ivan Khoronzhuk To: mugunthanvnm@ti.com Cc: grygorii.strashko@ti.com, netdev@vger.kernel.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, Ivan Khoronzhuk Subject: [PATCH] net: ethernet: ti: davinci_cpdma: correct check on NULL in set rate Date: Wed, 18 Jan 2017 02:28:06 +0200 Message-Id: <1484699286-6197-1-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Check "ch" on NULL first, then get ctlr. Signed-off-by: Ivan Khoronzhuk --- Based on net-next/master drivers/net/ethernet/ti/davinci_cpdma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c b/drivers/net/ethernet/ti/davinci_cpdma.c index d80bff1..7ecc6b7 100644 --- a/drivers/net/ethernet/ti/davinci_cpdma.c +++ b/drivers/net/ethernet/ti/davinci_cpdma.c @@ -835,8 +835,8 @@ EXPORT_SYMBOL_GPL(cpdma_chan_get_min_rate); */ int cpdma_chan_set_rate(struct cpdma_chan *ch, u32 rate) { - struct cpdma_ctlr *ctlr = ch->ctlr; unsigned long flags, ch_flags; + struct cpdma_ctlr *ctlr; int ret, prio_mode; u32 rmask; @@ -846,6 +846,7 @@ int cpdma_chan_set_rate(struct cpdma_chan *ch, u32 rate) if (ch->rate == rate) return rate; + ctlr = ch->ctlr; spin_lock_irqsave(&ctlr->lock, flags); spin_lock_irqsave(&ch->lock, ch_flags);