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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 E7274C5DF60 for ; Fri, 8 Nov 2019 11:37:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD28921D7E for ; Fri, 8 Nov 2019 11:37:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213079; bh=MeTFZGRJid8ZbNeiR81q23RkFona0u2IvdbdJMDE4Yo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jm8sFr+SpDSyI1fz1P0L6OzqZY4plCqCblD/zyl8QugjPBBFnDVwmsgitZtifC/Z/ rY4cbaPBksgzvC6n84/FSeTEsROGNV/V8RO8Ma5o+v22mfk4dFgQJXhonvgZViHLP+ jmpAdm5bvYjAmA5MK6Hmz5EbQlz1dzlUYfdWvcng= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732022AbfKHLh7 (ORCPT ); Fri, 8 Nov 2019 06:37:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:50742 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731463AbfKHLh6 (ORCPT ); Fri, 8 Nov 2019 06:37:58 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B77B321D6C; Fri, 8 Nov 2019 11:37:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573213077; bh=MeTFZGRJid8ZbNeiR81q23RkFona0u2IvdbdJMDE4Yo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jbh0crwp9EvwXkrPSS9YSSH4+yq3poZrF9rRoSOc0krts9Olljvstcjrj5k/atK4M IPDPXDMwxFXnpmJhM4iWYdayUmSYKkIkN2GgXus3qKXQf4e+9GqyebB4gRdaKOQGoN 8fHxcVJrLdIu/ABXzM11oX295UvXjprKy8+KnaeU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marcus Folkesson , Jonathan Cameron , Sasha Levin , linux-iio@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 004/205] iio: dac: mcp4922: fix error handling in mcp4922_write_raw Date: Fri, 8 Nov 2019 06:34:31 -0500 Message-Id: <20191108113752.12502-4-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108113752.12502-1-sashal@kernel.org> References: <20191108113752.12502-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org From: Marcus Folkesson [ Upstream commit 0833627fc3f757a0dca11e2a9c46c96335a900ee ] Do not try to write negative values and make sure that the write goes well. Signed-off-by: Marcus Folkesson Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin --- drivers/iio/dac/mcp4922.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/iio/dac/mcp4922.c b/drivers/iio/dac/mcp4922.c index bf9aa3fc0534e..b5190d1dae8e3 100644 --- a/drivers/iio/dac/mcp4922.c +++ b/drivers/iio/dac/mcp4922.c @@ -94,17 +94,22 @@ static int mcp4922_write_raw(struct iio_dev *indio_dev, long mask) { struct mcp4922_state *state = iio_priv(indio_dev); + int ret; if (val2 != 0) return -EINVAL; switch (mask) { case IIO_CHAN_INFO_RAW: - if (val > GENMASK(chan->scan_type.realbits-1, 0)) + if (val < 0 || val > GENMASK(chan->scan_type.realbits - 1, 0)) return -EINVAL; val <<= chan->scan_type.shift; - state->value[chan->channel] = val; - return mcp4922_spi_write(state, chan->channel, val); + + ret = mcp4922_spi_write(state, chan->channel, val); + if (!ret) + state->value[chan->channel] = val; + return ret; + default: return -EINVAL; } -- 2.20.1