Commit df7c3bf2 authored May 30, 2018 by Stephen Boyd Committed by Lee Jones Jun 04, 2018

mfd: cros_ec_dev: Don't advertise junk features on failure

If the feature query fails during this driver's probe, we memset the
features bits to 0, but then we continue to overwrite that with whatever
junk we read back when the feature probing failed. In the case of a SPI
device, it may be complete junk, causing the caller of this function to
think certain features are present when they aren't. Don't copy over the
bad message on failure so we can fail more gracefully.

Fixes: e4244ebd ("platform/chrome: Introduce a new function to check EC features.")
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Acked-by: Benson Leung <bleung@chromium.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

parent 3aa2177e

drivers/mfd/cros_ec_dev.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -113,9 +113,9 @@ static int cros_ec_check_features(struct cros_ec_dev *ec, int feature)
		dev_warn(ec->dev, "cannot get EC features: %d/%d\n",
		ret, msg->result);
		memset(ec->features, 0, sizeof(ec->features));
		}

		} else {
		memcpy(ec->features, msg->data, sizeof(ec->features));
		}

		dev_dbg(ec->dev, "EC features %08x %08x\n",
		ec->features[0], ec->features[1]);