Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp864848yba; Wed, 24 Apr 2019 10:51:12 -0700 (PDT) X-Google-Smtp-Source: APXvYqwESourbgI69f9weBVimAHFpiJjIw/kZiopJgGFggFLk3XbxrtqWW0o7mM60jGP81piq2aB X-Received: by 2002:aa7:9148:: with SMTP id 8mr4666995pfi.176.1556128272549; Wed, 24 Apr 2019 10:51:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556128272; cv=none; d=google.com; s=arc-20160816; b=J4wd2tPq8Szv0VBCXXQx8rvnEer9gWcEKs4PfonvQPi8eac3QvvU3b8pQiy8fGIJDo +lHiJA+QxQC7kksxB9yHQCLnLpabubetnwmU5AXmmrE2aKbl1amRwPv9FsjleWXnTbYg +b0DVdM6zdSe9rvQmbMlgeSoIWObQETBJ0dCFncumlNJFdu+r8qpWZ2NKHELtKN51XN3 DMyPVKS2xORJSNRmEmy4Y3ZgOMzshHDbOOCormUk3cpn085VwrYXRRDmVq+tD+NV37gQ QYYiDaPsUj9FrlJhnTulEJDXwsFDD5pJQdiMkkYKs9mDQs1KnY+pub76mURZ7uFgqGIm q8TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0I33DDb3uC3+l/YlJjbOS5rsrNqsJgqWp+yHSEg8RJI=; b=eYqpr54jQDvrAO05kSO9VCWXpFRyPZ8db4+e7C9hA6UCgrlFkOQdVutDQYKvVscDQq o7GqPN3JtR5mj5w5YrErwLRDuRS8RGPKNH9MoJTs+hu4xmgFxZ1PIiuFpujblojIdGII wCbBt85YYtNtsa9HLXD8C5QL6I2OEt9KXL3g3vwObBD9mPXCvG6IePtGWfNkPByKw/p4 AJlKMlw0BngYNWio06potnOPi3vE4V/1IworZeggc66pNivtD/SD7AoQyxYQqmU+lt3S l9K/xkFw7EZ2BqTy3Wr+eu9ZvrX+qaQhq7k3d9R5rntrFvYdkmsdfywf6otk8+9m52RO USNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gZI85NAe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b61si19462759plb.22.2019.04.24.10.50.57; Wed, 24 Apr 2019 10:51:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=gZI85NAe; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391212AbfDXRsN (ORCPT + 99 others); Wed, 24 Apr 2019 13:48:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:57802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403777AbfDXRbV (ORCPT ); Wed, 24 Apr 2019 13:31:21 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (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 2D8AB2054F; Wed, 24 Apr 2019 17:31:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556127080; bh=m8a22znsMr2CzsgnMSXMk3mQECatXNqkPecNp57vSzY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gZI85NAeOAeN7iv/mNNeca51EYOq67iyDH7ai/MDVwZSCrekyhJElM8MzOS2u4nwX FXSnE+g14EyQ1rSXEs5imJ+i0D8xPnNJuA3z8kIuitAioxi6KGbgHXKsh21c0KzBDS E/CNWDgkvF6QtODmzItGRGTeHnjZwuBpUq3WupXk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Geert Uytterhoeven , Ulrich Hecht , Wolfram Sang , Dirk Behme , Simon Horman Subject: [PATCH 4.19 55/96] serial: sh-sci: Fix HSCIF RX sampling point adjustment Date: Wed, 24 Apr 2019 19:10:00 +0200 Message-Id: <20190424170923.481759417@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170919.829037226@linuxfoundation.org> References: <20190424170919.829037226@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Geert Uytterhoeven commit 6b87784b53592a90d21576be8eff688b56d93cce upstream. The calculation of the sampling point has min() and max() exchanged. Fix this by using the clamp() helper instead. Fixes: 63ba1e00f178a448 ("serial: sh-sci: Support for HSCIF RX sampling point adjustment") Signed-off-by: Geert Uytterhoeven Reviewed-by: Ulrich Hecht Reviewed-by: Wolfram Sang Acked-by: Dirk Behme Cc: stable Reviewed-by: Simon Horman Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/sh-sci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -2504,7 +2504,7 @@ done: * last stop bit; we can increase the error * margin by shifting the sampling point. */ - int shift = min(-8, max(7, deviation / 2)); + int shift = clamp(deviation / 2, -8, 7); hssrr |= (shift << HSCIF_SRHP_SHIFT) & HSCIF_SRHP_MASK;