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=-5.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 D66FAC04A6B for ; Mon, 6 May 2019 14:51:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9C3DB205ED for ; Mon, 6 May 2019 14:51:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557154261; bh=UfssI2McWSk4xSq+ib9h55EucR/JvCGHpkdxHQJkJBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RppZzfVE3fhQC2/ghd/v0P0vbXMxnKwz4aAl4RQ3IDhBSO0PJf54IKCYAyVAQ52he a0pHIFULjW85DqK9qSJUUcFysj0B5zFufZs2PguVam7/kgJkfIKw/5ngSp2qJV3wDb yS+bHLg6rIrH3dD9mq/nWvOLTNbXPah5GfmOwoOE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729499AbfEFOvA (ORCPT ); Mon, 6 May 2019 10:51:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:50398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728719AbfEFOtJ (ORCPT ); Mon, 6 May 2019 10:49:09 -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 F222021019; Mon, 6 May 2019 14:49:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557154149; bh=UfssI2McWSk4xSq+ib9h55EucR/JvCGHpkdxHQJkJBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yBAn/pprv4p01v+kPHCzcvHVTLNaGpxqvXpgPYIGDvctwF5vBjUIFrztHR+FZtPYP Py6GnMT50KrgTnLK3rrWd5rIIOcFEmD/XIS71lvfxeZhZGNn89IRfjP67WUqcq3O0t R9qddasC6GnBVPrIpz6/Fss9esG4sVJSRwswX+rE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeremy Fertic , Jonathan Cameron Subject: [PATCH 4.9 55/62] staging: iio: adt7316: allow adt751x to use internal vref for all dacs Date: Mon, 6 May 2019 16:33:26 +0200 Message-Id: <20190506143056.133484166@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190506143051.102535767@linuxfoundation.org> References: <20190506143051.102535767@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: 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 @@ -1089,7 +1089,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);