From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDA7FC433FE for ; Sun, 24 Oct 2021 11:15:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BAAC86101D for ; Sun, 24 Oct 2021 11:15:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231397AbhJXLSD (ORCPT ); Sun, 24 Oct 2021 07:18:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:53282 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231400AbhJXLSA (ORCPT ); Sun, 24 Oct 2021 07:18:00 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 096AF60FE8; Sun, 24 Oct 2021 11:15:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1635074140; bh=cb+Ww99sXzKr/hd0fqismO25Saq/zK525HEf4lT5Zx0=; h=Subject:To:From:Date:From; b=I/wTooiarAOpV8jiVdzI2i1ttv1OXcA8ZPw3jGgV7s50Zl/NS16HH8IX0ssIqRoYq SSIJfKKL0TeibI3dLLtOSVDCJ81IwLGjr+W7W8Mrya/JuZtwLWkBHsaICtY4PbkrN3 oTFwDWma10Ly95lC952VcBUMBIlVkIVdcR/FVWHg= Subject: patch "iio: adc: tsc2046: fix scan interval warning" added to char-misc-next To: o.rempel@pengutronix.de, Jonathan.Cameron@huawei.com, Stable@vger.kernel.org From: Date: Sun, 24 Oct 2021 13:15:10 +0200 Message-ID: <163507411051226@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is a note to let you know that I've just added the patch titled iio: adc: tsc2046: fix scan interval warning to my char-misc git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git in the char-misc-next branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will also be merged in the next major kernel release during the merge window. If you have any questions about this process, please let me know. >From 69b31fd7a61784692db6433c05d46915b1b1a680 Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Thu, 7 Oct 2021 11:30:06 +0200 Subject: iio: adc: tsc2046: fix scan interval warning Sync if statement with the actual warning. Fixes: 9504db5765e8 ("iio: adc: tsc2046: fix a warning message in tsc2046_adc_update_scan_mode()") Signed-off-by: Oleksij Rempel Link: https://lore.kernel.org/r/20211007093007.1466-2-o.rempel@pengutronix.de Cc: Signed-off-by: Jonathan Cameron --- drivers/iio/adc/ti-tsc2046.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/adc/ti-tsc2046.c b/drivers/iio/adc/ti-tsc2046.c index 170950d5dd49..d84ae6b008c1 100644 --- a/drivers/iio/adc/ti-tsc2046.c +++ b/drivers/iio/adc/ti-tsc2046.c @@ -398,7 +398,7 @@ static int tsc2046_adc_update_scan_mode(struct iio_dev *indio_dev, priv->xfer.len = size; priv->time_per_scan_us = size * 8 * priv->time_per_bit_ns / NSEC_PER_USEC; - if (priv->scan_interval_us > priv->time_per_scan_us) + if (priv->scan_interval_us < priv->time_per_scan_us) dev_warn(&priv->spi->dev, "The scan interval (%d) is less then calculated scan time (%d)\n", priv->scan_interval_us, priv->time_per_scan_us); -- 2.33.1