From patchwork Thu Apr 16 13:24:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 227680 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FF1FC2BB85 for ; Thu, 16 Apr 2020 15:10:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 123F6214AF for ; Thu, 16 Apr 2020 15:10:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587049856; bh=xwwvXdkTLkHv6AGvthi0kajQIzbM5WF2VxClMmRruQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bvuftq2YskAQI1msifpWPYVZe9Gv6Cv0KLgPjFqKgOb7+YX3fW/T42GOrsH/j0/Wd iR5R8YPQA7Wyk/ZGGnfjQB+R/fdBU90J0B38I4XuqgNVVmkZvzfnyfc9/uejwN9OEt Mvav/KBKr2EWRoDvaGBvtm3LZEl+eou2K6PGo3cc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2408519AbgDPNuh (ORCPT ); Thu, 16 Apr 2020 09:50:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:36512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728977AbgDPNua (ORCPT ); Thu, 16 Apr 2020 09:50:30 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4463B21744; Thu, 16 Apr 2020 13:50:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587045028; bh=xwwvXdkTLkHv6AGvthi0kajQIzbM5WF2VxClMmRruQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LkMAi9r6O21412xbyOsZWXHz0J2bNFj2smGp3rPMlmO5LvxaIylJ9t0PdWn/GZSr+ l7oFNHxCqME5D2hhZ6Bud7EcJb6APMwbTw1+vLBtTmjmLxxScalX8GP3l95TN0kdJM HFNeBSVy29b6WlphontYPEBqVLl/Wz88MM7T00Y4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paul Cercueil , Stephen Boyd Subject: [PATCH 5.4 200/232] clk: ingenic/TCU: Fix round_rate returning error Date: Thu, 16 Apr 2020 15:24:54 +0200 Message-Id: <20200416131340.282150287@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200416131316.640996080@linuxfoundation.org> References: <20200416131316.640996080@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paul Cercueil commit edcc42945dee85e9dec3737f3dbf59d917ae5418 upstream. When requesting a rate superior to the parent's rate, it would return -EINVAL instead of simply returning the parent's rate like it should. Fixes: 4f89e4b8f121 ("clk: ingenic: Add driver for the TCU clocks") Cc: stable@vger.kernel.org Signed-off-by: Paul Cercueil Link: https://lkml.kernel.org/r/20200213161952.37460-2-paul@crapouillou.net Signed-off-by: Stephen Boyd Signed-off-by: Greg Kroah-Hartman --- drivers/clk/ingenic/tcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/clk/ingenic/tcu.c +++ b/drivers/clk/ingenic/tcu.c @@ -189,7 +189,7 @@ static long ingenic_tcu_round_rate(struc u8 prescale; if (req_rate > rate) - return -EINVAL; + return rate; prescale = ingenic_tcu_get_prescale(rate, req_rate);