Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2726088pxj; Mon, 31 May 2021 09:11:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxeE8fXROvGOlAiGh1klZ8QGtHu0QF2qW1yXGgl0fjQrYqLr03/AFjccxL6fN2d2wtjBgfB X-Received: by 2002:a05:6602:14d3:: with SMTP id b19mr17839464iow.154.1622477491077; Mon, 31 May 2021 09:11:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622477491; cv=none; d=google.com; s=arc-20160816; b=zQ9UfHktAKjHh2YUWd0WbSfOEHKeew4gDtBZxjfPcVs9jM796iH2wmwEHHNvleFBth ldFe4HnhOhli/bPpxdoLq9zWLDBojKTmbir2qXdExru8TqtpRQBV8rck3fnccrnIVucO oF9igoxfF6hW8w2NHnY/dTA2QuCacgS9YGqsUsNQXyOFBW5aadD76eZ6w1dDgpdgXQXj g/YhqMck6FIZ6B61ZOn2qbBwels1jueP2fKiutbZuGJ5/2ceRR7s6GUH/eS+ivuzv3se MMAmE8/WsdtxSg37GsObxQu3b2ter8bHCWY2XlECaLCMSE6DWAGZKshEUCXhky5TK+BQ FrNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=psRPt46dGPiQ3BzjfKFMGI5euvREVXVDue/LwLuD3UQ=; b=csS8XbN1Y4trz/9JS1TyKP5vs7zB+y0TcQDjFeypzmkJesMk92b9oQ9LB2iRax80Rt Y/SJSEqTNwRcgUZhQCftCDQpENzTqtopNirR5KOOoeMX3RlHvPXTOCgpAGybCDczjzTb gz+aNdcmQyUwer7zVZCTt8ccicIwmDqQiOZBIVbTUUURqDVMMPrApjv31LO5eYHl2P0s qpD0wB+tFWqwUyg1PI9k9A5MEHs7Z0C6070pqAXI+TJkBAo5ADxdZIeW+OgHnrK5oZdK CdvOihrJlmcXcD/99MAJ1AQ6b2MnSih2fcD5v2BbwjDq/AUro5G+10+fq4E62ZV68IS+ vUvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Yckhot4a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c7si14833563jap.0.2021.05.31.09.11.17; Mon, 31 May 2021 09:11:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Yckhot4a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232629AbhEaQMR (ORCPT + 99 others); Mon, 31 May 2021 12:12:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:36490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233900AbhEaOhg (ORCPT ); Mon, 31 May 2021 10:37:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 63AF76186A; Mon, 31 May 2021 13:51:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1622469113; bh=sg8BA99lz8X4n17e5wbLXqVoyRIWCYyTeQ0xl9m3Ti0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yckhot4aWvweQmoijUXmFgO9OI5PCDM9GX7PQSf195HgN8z41yqLfA6e/FUZmBJGn WWqgtdgOPb/wO4menqj+OqeJrMaUCeLUE3ooo5b9OHJEsLoEv+IxAVTG3/Ph05Y0ZR ac2DoxQkKoMLhgOWtk2B6Zs13osbe2kvqj6tjHuE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lucas Stankus , Jonathan Cameron , Stable@vger.kernel.org Subject: [PATCH 5.12 075/296] staging: iio: cdc: ad7746: avoid overwrite of num_channels Date: Mon, 31 May 2021 15:12:10 +0200 Message-Id: <20210531130706.375225101@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210531130703.762129381@linuxfoundation.org> References: <20210531130703.762129381@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lucas Stankus commit 04f5b9f539ce314f758d919a14dc7a669f3b7838 upstream. AD7745 devices don't have the CIN2 pins and therefore can't handle related channels. Forcing the number of AD7746 channels may lead to enabling more channels than what the hardware actually supports. Avoid num_channels being overwritten after first assignment. Signed-off-by: Lucas Stankus Fixes: 83e416f458d53 ("staging: iio: adc: Replace, rewrite ad7745 from scratch.") Signed-off-by: Jonathan Cameron Cc: Signed-off-by: Greg Kroah-Hartman --- drivers/staging/iio/cdc/ad7746.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/staging/iio/cdc/ad7746.c +++ b/drivers/staging/iio/cdc/ad7746.c @@ -700,7 +700,6 @@ static int ad7746_probe(struct i2c_clien indio_dev->num_channels = ARRAY_SIZE(ad7746_channels); else indio_dev->num_channels = ARRAY_SIZE(ad7746_channels) - 2; - indio_dev->num_channels = ARRAY_SIZE(ad7746_channels); indio_dev->modes = INDIO_DIRECT_MODE; if (pdata) {