Commit 625faa6a authored Oct 20, 2015 by Russell King

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: 25689998 ("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>

parent 8a603f91

drivers/clk/clkdev.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -333,7 +333,8 @@ int clk_add_alias(const char alias, const char alias_dev_name,
	if (IS_ERR(r))		if (IS_ERR(r))
	return PTR_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);		clk_put(r);

	return l ? 0 : -ENODEV;		return l ? 0 : -ENODEV;