From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:56419 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751539AbbKFG0N (ORCPT ); Fri, 6 Nov 2015 01:26:13 -0500 Subject: Patch "clkdev: fix clk_add_alias() with a NULL alias device name" has been added to the 4.2-stable tree To: rmk+kernel@arm.linux.org.uk, aaro.koskinen@iki.fi, gregkh@linuxfoundation.org Cc: , From: Date: Thu, 05 Nov 2015 22:26:07 -0800 Message-ID: <14467911674397@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled clkdev: fix clk_add_alias() with a NULL alias device name to the 4.2-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: clkdev-fix-clk_add_alias-with-a-null-alias-device-name.patch and it can be found in the queue-4.2 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 625faa6a720d26fc0db9e20b48dc0dfe4c8d8ddf Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 20 Oct 2015 11:49:44 +0100 Subject: clkdev: fix clk_add_alias() with a NULL alias device name From: Russell King commit 625faa6a720d26fc0db9e20b48dc0dfe4c8d8ddf upstream. 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. Fixes: 2568999835d7 ("clkdev: add clkdev_create() helper") Reported-by: Aaro Koskinen Tested-by: Aaro Koskinen Signed-off-by: Russell King Signed-off-by: Greg Kroah-Hartman --- drivers/clk/clkdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c @@ -333,7 +333,8 @@ int clk_add_alias(const char *alias, con 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; Patches currently in stable-queue which might be from rmk+kernel@arm.linux.org.uk are queue-4.2/arm-8445-1-fix-vdsomunge-not-to-depend-on-glibc-specific-byteswap.h.patch queue-4.2/clkdev-fix-clk_add_alias-with-a-null-alias-device-name.patch queue-4.2/arm-8449-1-fix-bug-in-vdsomunge-swab32-macro.patch