summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2016-05-07 00:10:18 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2017-05-01 21:20:04 +0000
commit9bf00ed1d938fb68a8bf3ffb7dfedb84d78244f4 (patch)
tree575f3bc01dfbb86e9235950f2c000b95af4f8dc9
parenta61c79c936ce25cb929564fe8c621307c5c4f46e (diff)
downloadchrome-ec-9bf00ed1d938fb68a8bf3ffb7dfedb84d78244f4.tar.gz
UPSTREAM: kionix: Initialize rv in all cases
Signed-off-by: Stefan Reinauer <reinauer@chromium.org> BRANCH=cyan, ultima BUG=b:27849483, b:36973851 TEST=compile tested for Samus Reviewed-on: https://chromium-review.googlesource.com/343282 Commit-Ready: Stefan Reinauer <reinauer@chromium.org> Tested-by: Stefan Reinauer <reinauer@chromium.org> Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> (cherry picked from commit 65bca9b9fdd797c1a659718f08b4eaa3d7de41ce) Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/359407 Reviewed-on: https://chromium-review.googlesource.com/409494 Reviewed-by: Stefan Reinauer <reinauer@chromium.org> (cherry picked from commit 7039c4744aca6afc28b9087fbe377f268afd52ae) Change-Id: Ib7a0a75a2d63cf8f55d0b59f4a3225da2cb4e70b Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/489767 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
-rw-r--r--driver/accel_kionix.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/driver/accel_kionix.c b/driver/accel_kionix.c
index b715173b7e..ecd96c3119 100644
--- a/driver/accel_kionix.c
+++ b/driver/accel_kionix.c
@@ -129,7 +129,7 @@ static int find_param_index(const int eng_val, const int round_up,
static int raw_read8(const int port, const int addr, const int reg,
int *data_ptr)
{
- int rv;
+ int rv = EC_ERROR_INVAL;
if (KIONIX_IS_SPI(addr)) {
#ifdef CONFIG_SPI_ACCEL_PORT
@@ -153,7 +153,7 @@ static int raw_read8(const int port, const int addr, const int reg,
*/
static int raw_write8(const int port, const int addr, const int reg, int data)
{
- int rv;
+ int rv = EC_ERROR_INVAL;
if (KIONIX_IS_SPI(addr)) {
#ifdef CONFIG_SPI_ACCEL_PORT
@@ -171,7 +171,7 @@ static int raw_write8(const int port, const int addr, const int reg, int data)
static int raw_read_multi(const int port, int addr, uint8_t reg,
uint8_t *rxdata, int rxlen)
{
- int rv;
+ int rv = EC_ERROR_INVAL;
if (KIONIX_IS_SPI(addr)) {
#ifdef CONFIG_SPI_ACCEL_PORT