From patchwork Tue Mar 1 12:34:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Berder X-Patchwork-Id: 1599363 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K7Gxx4XDrz9sFh for ; Tue, 1 Mar 2022 23:38:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7E9AC83CAC; Tue, 1 Mar 2022 13:37:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=outlook.fr Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id B385F83097; Tue, 1 Mar 2022 13:34:28 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn0814.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::814]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B0C8983A9D for ; Tue, 1 Mar 2022 13:34:25 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=outlook.fr Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=fberder@outlook.fr ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IXdiNVKHvSHMHgcnI9IsbgGyW0AZ2O+R7RqUKJ9+j2hpTjIk4GsApt+iN0OFFEGMjLNkzTT4533bbNnA4+5KbpUfEJIRGmd+x5CIhiJJGGsx9Q29mgQzA8YT119/iyqiYqISlUifcoWhf/0p9DcGJE78Ijv9bb+RCSllEFBXMBcaDj/9HTVaJdQ2wTvV08fXpZwd7qTXKR0sDnQKAmfhD84a7m5EA0jl6dUcf7wI6q7Zd/ktfCLi9O5wpZmSzoW+jUXDNcG78DiUr2lNyplw3XG60Qy5aO0mxwewFkviOm/s+0XoszZgMTMOn0bDHm2LL0nhgoK1bNAg/N/NQG+Z1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4xO7hcFlmip4Q8OfRM6wLjr+A72ak7spZksWurydvJY=; b=UiMUvIBcTA4Y2dcL/gEBxzhx0gNFGqOPpELgg7M3039WftQOS2Fsd6iqTjrUjHlX1uljyxgeN1zRVrMx5ACs3JEA4UTu917cKmXCjs/CTSODm0o/0Re+3vjmFOF5LWAplvQmJuGG6GWPMCc97db7jzO8qonl6Sx2ZzeCuWSewNq08fYQFoWRmD05FNwJvafqQMpaqzXGRlDGQPnhf+FloZJm5U0yMn2SEGmLb5SvEPO3Jhr4+Mcq6ZJ/r+Ixq3QOp16+VtpSAH/J3745Yhd1JZp7kj8vzjzo0iJkKSKCdfDkl/U921vMibOgA4qhVD3L98/CS7PDjrtrugBIQv8pvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from HE1P192MB0009.EURP192.PROD.OUTLOOK.COM (2603:10a6:3:105::15) by VE1P192MB0638.EURP192.PROD.OUTLOOK.COM (2603:10a6:800:165::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.22; Tue, 1 Mar 2022 12:34:24 +0000 Received: from HE1P192MB0009.EURP192.PROD.OUTLOOK.COM ([fe80::7ce0:6bd:2b3a:829b]) by HE1P192MB0009.EURP192.PROD.OUTLOOK.COM ([fe80::7ce0:6bd:2b3a:829b%12]) with mapi id 15.20.5017.026; Tue, 1 Mar 2022 12:34:24 +0000 From: Francois Berder To: u-boot@lists.denx.de Cc: Francois Berder , Neil Armstrong , u-boot-amlogic@groups.io Subject: [PATCH] drivers: adc: fix return value if timeout occurs Date: Tue, 1 Mar 2022 13:34:13 +0100 Message-ID: X-Mailer: git-send-email 2.30.1 (Apple Git-130) X-TMN: [P5wMrKcIVXO4pJDGLYSdz2in/yIQSJqUuSC3nJXhoSwZ0eF5ne1FptLWEhI/vve4] X-ClientProxiedBy: PR3P192CA0015.EURP192.PROD.OUTLOOK.COM (2603:10a6:102:56::20) To HE1P192MB0009.EURP192.PROD.OUTLOOK.COM (2603:10a6:3:105::15) X-Microsoft-Original-Message-ID: <20220301123414.52023-1-fberder@outlook.fr> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a8b16987-fbc5-491f-f268-08d9fb7fd086 X-MS-TrafficTypeDiagnostic: VE1P192MB0638:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YjzMYTRqRi/nhXi2UFI7DNzxFZ7tJfawZFviUgme+cc8dYMbmfrmZkvp/pJc/+Cg1sLQTyVgJ+KutBXuEpFXfySbXnqTM54BQIEBnQxGqGM6ljFxOZot2U3qfDHi7zIx5oH+aF/ujiHYnZtFyGZIgRKVh1u9C5Wt9kw8fvvOBDr9o8YSpeX4VPs5p8B0L3RAXmG+OURWzd05dT54ucUn6IVXIHx2+wPqqBdMTP8HUOv/ZgNcj7l5V+/15auczFjHOzsogRS0Nw/1JYm6y+SqnmQuy+t4V8rotMoJBglCbxSSbYPAU434MBAh5r84sPORO4+SQq6dFLequJ1LIFafiNufYa7ZNvZKOTtYg5vagGxtdgOhtxMV/SEPFIonQzFVWr1IHVSCrjXgzB1AqbWHCC2IQ4KrRf1XDH3r6l6TTPcrWZm0rfeF/MK7j75PZcyAbpYl3GLm+2x4TKLcC4RtKGoIzRrJN1OymMe6a7WsKSoO61upMf2ENqO2udkVe9ReA9WX/hFj9TOfeEoUxx1bIvyKAyR1Zar60T/fUX9IxxitPSjy5M746Y3av4+TBOPpMQkYnXTL1uzCQ3cYH0REqA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iKNpERvDNL6no76ZvCeTCi7/dapbNUUEg4N2sibSLQ/s9m2y0MKAdQ3oTX2+lasnE0x/2MO2SvrICm9Fhj2LCt0xgmankBRYzYjNcrwChZw1d7KGoXKPZOVYk/miyL4jdGVZUKZIqAZqmdXaW1D3WgjG0tQkpAthZs4TBq5yrPp6DazrpTKM1kZ0iugkLtISsQA3UZaFWgw3hlR0+wr9tBZnmOojqy14Lb58gkzoOB5bVpIHrx69Wlv5fFrHFmcJPXNh0NxonYVw/Uo9+zcL1arvMqEHpU8njk4eQJb55Xdzglrag7k8vzeEdpobNuxCnAuFFc3E0zFcwiW3xZlAreVoyMmSZ9m+DugFKi72EgFFn/pNQ9E67MFhRVNXyf1gJM0KUaA18eIZwYEdeKT0jaEOuMDKPC0V6QQRSpGR5wGfdpl0lVbInNMGrYPQVQmg+n8BUPwu2aP3aPhu9Ov2qGp52LmiK8RWlNbxgvGJtDhpNNdtNZtisgUlqpxZxfsTAIn5yio77d7wzHD42tlsF0e/xH/qxfXlLUMSpiYUs7JrRbZ1x3aQEGSRdkCfzjcLg5z18aBfi71GeyLEW8gdtrB72a0xroIp33dREKdaARrvNTu1+tHxYoY3g+jkvj4iLPkmDAPnwyxpUhPY1jirFNWVV3L2PwAefjkKEZAwB9T+tTuuDiajpTEr7iuSGzMYqqJb+ihTx1ENeFz4iSZxsPmLMKHN9pzmQRDzIyQ3A8YQ4W5IPH8bZEmQoI7jvd+IR8wieXJHN0mikulCQlJ+pgClgH9uttPnqGLud+LueKgIci8fretNT8voVmIY8eT//9hL43V8qkQC1U4scl5rD18FYpMX6VYQCsG7V/FOJnZ/SZULtu/wqvzQNtDuo12Y/uv8a1EN30Afa+MCqGk3VVS69FZEDyED03PIVnE34u9WpqyHYhW3WMhuUtA5Ax7vTj1BLr0XYDbrQDnzYZQNE3HhLR2G1MGayVbOZZHIklNhShTRR+bcOARVH23qd32JbPjTVIlfGyn4inLD6r7Idg== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-fb43a.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: a8b16987-fbc5-491f-f268-08d9fb7fd086 X-MS-Exchange-CrossTenant-AuthSource: HE1P192MB0009.EURP192.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Mar 2022 12:34:24.3495 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1P192MB0638 X-Mailman-Approved-At: Tue, 01 Mar 2022 13:36:28 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Because unsigned integers cannot be negative, timeout variable is never less than zero. Hence, checks in Amlogic Meson ADC driver to detect timeouts always evaluated to false. Fix that. Signed-off-by: Francois Berder --- drivers/adc/meson-saradc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c index 1a45a3a265..a48200a769 100644 --- a/drivers/adc/meson-saradc.c +++ b/drivers/adc/meson-saradc.c @@ -192,7 +192,8 @@ meson_saradc_get_fifo_count(struct meson_saradc_priv *priv) static int meson_saradc_lock(struct meson_saradc_priv *priv) { - uint val, timeout = 10000; + uint val; + int timeout = 10000; /* prevent BL30 from using the SAR ADC while we are using it */ regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELAY, @@ -246,7 +247,8 @@ static int meson_saradc_calib_val(struct meson_saradc_priv *priv, int val) static int meson_saradc_wait_busy_clear(struct meson_saradc_priv *priv) { - uint regval, timeout = 10000; + uint regval; + int timeout = 10000; /* * NOTE: we need a small delay before reading the status, otherwise