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 X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 59A28C04E53 for ; Wed, 15 May 2019 12:20:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 235AB20578 for ; Wed, 15 May 2019 12:20:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557922825; bh=APERk5M5FEbChD90GwMBIzcU7qaUVL7l35l+cDgHsLI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BF8Uo8pG8OYbI/iTXJVwu43jR/52YlOFRnsTQsMybLPuUNvzuF3jnrchyoOWKFpDj JhE7K3xc2btiZpy1p6EJ2CMyXekeuwtv28rw9YQtxS97PbuZ8FOP/FzqoRN3UGwKXm WRxGUzxOP+31KYyOeUO/OLAEHyLASsOJKKudxjxU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727230AbfEOK7o (ORCPT ); Wed, 15 May 2019 06:59:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:56360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727226AbfEOK7n (ORCPT ); Wed, 15 May 2019 06:59:43 -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 DAABE216FD; Wed, 15 May 2019 10:59:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557917983; bh=APERk5M5FEbChD90GwMBIzcU7qaUVL7l35l+cDgHsLI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cld0labq1lhN4ICWx/O49EAVs9bTzE39A1h3Ls9sHvdJjoisewDSl4KOpsuLThXED Ilb+WuUP1JG7Xbzg6CklkgCns4a0/QpQYsjE/soYSjb6q6Qdmv6SL9rT7JMcZyjdgt HjAOskgv4aIEKMmlCzMpMjBaKSyInEtCN7+kSn8Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeremy Fertic , Jonathan Cameron Subject: [PATCH 3.18 48/86] staging: iio: adt7316: allow adt751x to use internal vref for all dacs Date: Wed, 15 May 2019 12:55:25 +0200 Message-Id: <20190515090652.013389348@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090642.339346723@linuxfoundation.org> References: <20190515090642.339346723@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jeremy Fertic commit 10bfe7cc1739c22f0aa296b39e53f61e9e3f4d99 upstream. With adt7516/7/9, internal vref is available for dacs a and b, dacs c and d, or all dacs. The driver doesn't currently support internal vref for all dacs. Change the else if to an if so both bits are checked rather than just one or the other. Signed-off-by: Jeremy Fertic Fixes: 35f6b6b86ede ("staging: iio: new ADT7316/7/8 and ADT7516/7/9 driver") Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman --- drivers/staging/iio/addac/adt7316.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/staging/iio/addac/adt7316.c +++ b/drivers/staging/iio/addac/adt7316.c @@ -1092,7 +1092,7 @@ static ssize_t adt7316_store_DAC_interna ldac_config = chip->ldac_config & (~ADT7516_DAC_IN_VREF_MASK); if (data & 0x1) ldac_config |= ADT7516_DAC_AB_IN_VREF; - else if (data & 0x2) + if (data & 0x2) ldac_config |= ADT7516_DAC_CD_IN_VREF; } else { ret = kstrtou8(buf, 16, &data);