From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from ns.lynxeye.de ([87.118.118.114] helo=lynxeye.de) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBh7e-0007rF-QL for barebox@lists.infradead.org; Fri, 07 Feb 2014 08:49:19 +0000 Received: from tellur.localdomain (p57B5E0F6.dip0.t-ipconnect.de [87.181.224.246]) by lynxeye.de (Postfix) with ESMTPA id 51CEA18B425F for ; Fri, 7 Feb 2014 09:47:40 +0100 (CET) From: Lucas Stach Date: Fri, 7 Feb 2014 09:48:55 +0100 Message-Id: <1391762936-2747-14-git-send-email-dev@lynxeye.de> In-Reply-To: <1391762936-2747-1-git-send-email-dev@lynxeye.de> References: <1391762936-2747-1-git-send-email-dev@lynxeye.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 13/14] clk: avoid possible NULL ptr deref To: barebox@lists.infradead.org Signed-off-by: Lucas Stach --- drivers/clk/clkdev.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c index 66cd832..d9a1c21 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -179,9 +179,11 @@ struct clk *clk_get(struct device_d *dev, const char *con_id) if (!IS_ERR(clk)) return clk; - clk = of_clk_get_by_name(dev->device_node, con_id); - if (!IS_ERR(clk)) - return clk; + if (dev) { + clk = of_clk_get_by_name(dev->device_node, con_id); + if (!IS_ERR(clk)) + return clk; + } return clk_get_sys(dev_id, con_id); } -- 1.8.5.3 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox