From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:60198 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752066AbdD0KEi (ORCPT ); Thu, 27 Apr 2017 06:04:38 -0400 Subject: Patch "clk: at91: usb: fix determine_rate prototype again" has been added to the 3.18-stable tree To: arnd@arndb.de, boris.brezillon@free-electrons.com, gregkh@linuxfoundation.org, mturquette@linaro.org Cc: , From: Date: Thu, 27 Apr 2017 12:04:11 +0200 In-Reply-To: <20170421124528.2644028-1-arnd@arndb.de> Message-ID: <1493287451162217@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 clk: at91: usb: fix determine_rate prototype again to the 3.18-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: clk-at91-usb-fix-determine_rate-prototype-again.patch and it can be found in the queue-3.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From arnd@arndb.de Thu Apr 27 11:55:29 2017 From: Arnd Bergmann Date: Fri, 21 Apr 2017 14:45:23 +0200 Subject: clk: at91: usb: fix determine_rate prototype again To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, Arnd Bergmann , Boris Brezillon , Mike Turquette , linux-kernel@vger.kernel.org Message-ID: <20170421124528.2644028-1-arnd@arndb.de> From: Arnd Bergmann We had an incorrect backport of 4591243102fa ("clk: at91: usb: propagate rate modification to the parent clk") that was fixed incorrectly in linux-3.18.y by 76723e7ed589 ("clk: at91: usb: fix determine_rate prototype") as shown by this warning: drivers/clk/at91/clk-usb.c:155:20: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] drivers/clk/at91/clk-usb.c:193:20: warning: initialization from incompatible pointer type [-Wincompatible-pointer-types] This should fix it properly. Acked-by: Boris Brezillon Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- drivers/clk/at91/clk-usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/clk/at91/clk-usb.c +++ b/drivers/clk/at91/clk-usb.c @@ -59,7 +59,7 @@ static unsigned long at91sam9x5_clk_usb_ static long at91sam9x5_clk_usb_determine_rate(struct clk_hw *hw, unsigned long rate, unsigned long *best_parent_rate, - struct clk_hw **best_parent_hw) + struct clk **best_parent_hw) { struct clk *parent = NULL; long best_rate = -EINVAL; @@ -91,7 +91,7 @@ static long at91sam9x5_clk_usb_determine best_rate = tmp_rate; best_diff = tmp_diff; *best_parent_rate = tmp_parent_rate; - *best_parent_hw = __clk_get_hw(parent); + *best_parent_hw = parent; } if (!best_diff || tmp_rate < rate) Patches currently in stable-queue which might be from arnd@arndb.de are queue-3.18/acpi-power-avoid-maybe-uninitialized-warning.patch queue-3.18/gadgetfs-fix-uninitialized-variable-in-error-handling.patch queue-3.18/clk-at91-usb-fix-determine_rate-prototype-again.patch queue-3.18/arm-psci-fix-header-file.patch queue-3.18/dm-bufio-hide-bogus-warning.patch