diff options
author | Shawn Nematbakhsh <shawnn@google.com> | 2015-11-05 15:20:31 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2015-11-11 11:00:56 -0800 |
commit | 1ade79a8e60070f67960537aec8c564362cd6580 (patch) | |
tree | 7850e6c7ca3f8f17671774922c5c36d15d659e39 /driver | |
parent | 77e76fc7fb8ed606386eae7f8528ead205d740ea (diff) | |
download | chrome-ec-1ade79a8e60070f67960537aec8c564362cd6580.tar.gz |
cleanup: Fix gcc 5.2.1 compile errors
BUG=chromium:552006
BRANCH=None
TEST=`make buildall -j` and also verify panic reporting works on
glados_pd.
Change-Id: Ic9f1ec6b5297389df0d46bb38a67c156901ed956
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/311253
Commit-Ready: Shawn N <shawnn@gmail.com>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Alec Berg <alecaberg@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'driver')
-rw-r--r-- | driver/als_si114x.c | 1 | ||||
-rw-r--r-- | driver/usb_mux_pi3usb30532.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/driver/als_si114x.c b/driver/als_si114x.c index 482678ca15..9a4fd1ff85 100644 --- a/driver/als_si114x.c +++ b/driver/als_si114x.c @@ -241,6 +241,7 @@ static int read(const struct motion_sensor_t *s, vector_3_t v) break; default: CPRINTS("Invalid sensor type"); + return EC_ERROR_INVAL; } ret = raw_write8(s->addr, SI114X_REG_COMMAND, cmd); ret = EC_RES_IN_PROGRESS; diff --git a/driver/usb_mux_pi3usb30532.c b/driver/usb_mux_pi3usb30532.c index ceb80c9368..57f81ff3e9 100644 --- a/driver/usb_mux_pi3usb30532.c +++ b/driver/usb_mux_pi3usb30532.c @@ -26,7 +26,7 @@ static int pi3usb30532_read(int i2c_addr, uint8_t reg, uint8_t *val) if (reg == PI3USB30532_REG_VENDOR) *val = read & 0xff; - else if (reg == PI3USB30532_REG_CONTROL) + else /* reg == PI3USB30532_REG_CONTROL */ *val = (read >> 8) & 0xff; return EC_SUCCESS; @@ -85,7 +85,8 @@ static int pi3usb30532_set_mux(int i2c_addr, mux_state_t mux_state) /* Reads control register and updates mux_state accordingly */ static int pi3usb30532_get_mux(int i2c_addr, mux_state_t *mux_state) { - uint8_t reg, res; + uint8_t reg = 0; + uint8_t res; *mux_state = 0; res = pi3usb30532_read(i2c_addr, PI3USB30532_REG_CONTROL, ®); |