From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9A531F76DE; Tue, 28 Jan 2025 17:54:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738086859; cv=none; b=FikwVQyLWHA9I3JKrc28lbo9HdaH2UpqgbQqNSqztFXBUO6PIKbfTkZlD05Ks0p/gukjwfNPDxTXGJs7mP0fijK1uMU85zfYEWIml9XvuvTzHmMt0R9mU5nfpBLb7X0GT2VTlEgFPXj9hhJsJvR4aOE2xkdf+/821BgFShap174= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738086859; c=relaxed/simple; bh=a0r7euesar2xT4PhFxufLGgQyDxjBDwO/mX8bZGcpLI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qImwHL++vjW5Ouyz7nY0Yb8gvWBvc1GiwReiVW5oY2+GyWpDobKV0+yt7cpeWUK+ntCxEhg/p+xzR1tiAHcGyMN/lz5+b932tvF69MzpzLfwwbSHlD9SM40sFOhJuoYCXhVpdITpRrnklGQ9kFpFcyJOcZVNyUGsgdyXrmyaSZM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WoTxex5U; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WoTxex5U" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5103FC4CEE1; Tue, 28 Jan 2025 17:54:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738086858; bh=a0r7euesar2xT4PhFxufLGgQyDxjBDwO/mX8bZGcpLI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WoTxex5UFANREQ/3ndqWScVcOxVk21cCXVObbbJx2jEtwbQOFCQUkeLcVMnaNr+Qt xH/BlpW6oYsCAe/IIMcQWpQd99O8VD6sQicka2o3bEv67mhi9AsH0O6NPwzaFB3JMj Rzsx/Blct+2RQOluVIXzyl8tuAS+9St4WWg1dFlHgcIPenycpk13ynTztxrbATrVUh UUkIABtd87PVREzq00/EYq5dKhmEDcOQMJYKPqX9/Gow4BBKJtQ+Hrme1JB3a7g0Oe bV/eY8moxYOqXxF7C0ine3s26FvPGQAg7hZR1q+64oklZK7OsA253Whd47RPVSR36f ++6O9R9Mne64A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tomi Valkeinen , Sakari Ailus , Jai Luthra , Mauro Carvalho Chehab , Sasha Levin , mchehab@kernel.org, linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 6.12 02/12] media: i2c: ds90ub913: Add error handling to ub913_hw_init() Date: Tue, 28 Jan 2025 12:54:04 -0500 Message-Id: <20250128175414.1197295-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250128175414.1197295-1-sashal@kernel.org> References: <20250128175414.1197295-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.11 Content-Transfer-Encoding: 8bit From: Tomi Valkeinen [ Upstream commit acd8f58d7a3bce0fbd3263961cd09555c00464ba ] Add error handling to ub913_hw_init() using a new helper function, ub913_update_bits(). Reported-by: Sakari Ailus Closes: https://lore.kernel.org/all/Zv40EQSR__JDN_0M@kekkonen.localdomain/ Reviewed-by: Jai Luthra Signed-off-by: Tomi Valkeinen Signed-off-by: Sakari Ailus Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/i2c/ds90ub913.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/drivers/media/i2c/ds90ub913.c b/drivers/media/i2c/ds90ub913.c index 8eed4a200fd89..64e7a19c86c1a 100644 --- a/drivers/media/i2c/ds90ub913.c +++ b/drivers/media/i2c/ds90ub913.c @@ -8,6 +8,7 @@ * Copyright (c) 2023 Tomi Valkeinen */ +#include #include #include #include @@ -146,6 +147,19 @@ static int ub913_write(const struct ub913_data *priv, u8 reg, u8 val) return ret; } +static int ub913_update_bits(const struct ub913_data *priv, u8 reg, u8 mask, + u8 val) +{ + int ret; + + ret = regmap_update_bits(priv->regmap, reg, mask, val); + if (ret < 0) + dev_err(&priv->client->dev, + "Cannot update register 0x%02x %d!\n", reg, ret); + + return ret; +} + /* * GPIO chip */ @@ -733,10 +747,13 @@ static int ub913_hw_init(struct ub913_data *priv) if (ret) return dev_err_probe(dev, ret, "i2c master init failed\n"); - ub913_read(priv, UB913_REG_GENERAL_CFG, &v); - v &= ~UB913_REG_GENERAL_CFG_PCLK_RISING; - v |= priv->pclk_polarity_rising ? UB913_REG_GENERAL_CFG_PCLK_RISING : 0; - ub913_write(priv, UB913_REG_GENERAL_CFG, v); + ret = ub913_update_bits(priv, UB913_REG_GENERAL_CFG, + UB913_REG_GENERAL_CFG_PCLK_RISING, + FIELD_PREP(UB913_REG_GENERAL_CFG_PCLK_RISING, + priv->pclk_polarity_rising)); + + if (ret) + return ret; return 0; } -- 2.39.5