From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 20 Oct 2015 10:49:44 +0000 (+0100)
Subject: clkdev: fix clk_add_alias() with a NULL alias device name
X-Git-Tag: v4.14-rc1~4490^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=625faa6a720d26fc0db9e20b48dc0dfe4c8d8ddf;p=platform%2Fkernel%2Flinux-rpi.git

clkdev: fix clk_add_alias() with a NULL alias device name

clk_add_alias() was not correctly handling the case where alias_dev_name
was NULL: rather than producing an entry with a NULL dev_id pointer,
it would produce a device name of (null).  Fix this.

Cc: <stable@vger.kernel.org>
Fixes: 2568999835d7 ("clkdev: add clkdev_create() helper")
Reported-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c
index c0eaf09..779b6ff 100644
--- a/drivers/clk/clkdev.c
+++ b/drivers/clk/clkdev.c
@@ -333,7 +333,8 @@ int clk_add_alias(const char *alias, const char *alias_dev_name,
 	if (IS_ERR(r))
 		return PTR_ERR(r);
 
-	l = clkdev_create(r, alias, "%s", alias_dev_name);
+	l = clkdev_create(r, alias, alias_dev_name ? "%s" : NULL,
+			  alias_dev_name);
 	clk_put(r);
 
 	return l ? 0 : -ENODEV;