From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from down.free-electrons.com ([37.187.137.238]:49564 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753723AbbEOHQK convert rfc822-to-8bit (ORCPT ); Fri, 15 May 2015 03:16:10 -0400 Date: Fri, 15 May 2015 09:16:07 +0200 From: Boris Brezillon To: Sasha Levin Cc: stable@vger.kernel.org, stable-commits@vger.kernel.org, Michael Turquette Subject: Re: [added to the 3.18 stable tree] clk: at91: usb: propagate rate modification to the parent clk Message-ID: <20150515091607.4af9d01a@bbrezillon> In-Reply-To: <1431343152-19437-90-git-send-email-sasha.levin@oracle.com> References: <1431343152-19437-1-git-send-email-sasha.levin@oracle.com> <1431343152-19437-90-git-send-email-sasha.levin@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8BIT Sender: stable-owner@vger.kernel.org List-ID: Hi Sasha, On Mon, 11 May 2015 07:17:51 -0400 Sasha Levin wrote: > From: Boris Brezillon > > This patch has been added to the 3.18 stable tree. If you have any > objections, please let us know. Sorry for the late reply, actually this patch is introducing another bug: ->determine_rate() prototype changed in 4.0 (addition of the min and max arguments), which means this patch is not appropriate for pre 4.0 kernels. Below is a patch fixing this mismatch (please note that Greg already applied it on 3.19) Best Regards, Boris -- >8 -- >>From 73a2cf633be185570c7df689afedaebed86d8451 Mon Sep 17 00:00:00 2001 Subject: [PATCH] clk: at91: usb: fix determine_rate prototype Commit c67881fc890916206e723329e774391c6ed354ce is a backport of 0b67c43ce36a9964f1d5e3f973ee19eefd3f9f8f upstream commit, fixing a bug on clk rate change propagation. But in 4.0 ->determine_rate() prototype has changed, thus introducing a prototype mismatch when applying it on 3.19. Signed-off-by: Boris Brezillon --- drivers/clk/at91/clk-usb.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/clk/at91/clk-usb.c b/drivers/clk/at91/clk-usb.c index 0b7c3e8..0283a57 100644 --- a/drivers/clk/at91/clk-usb.c +++ b/drivers/clk/at91/clk-usb.c @@ -58,8 +58,6 @@ static unsigned long at91sam9x5_clk_usb_recalc_rate(struct clk_hw *hw, static long at91sam9x5_clk_usb_determine_rate(struct clk_hw *hw, unsigned long rate, - unsigned long min_rate, - unsigned long max_rate, unsigned long *best_parent_rate, struct clk_hw **best_parent_hw) { -- 1.9.1