Commit 2fcd8014 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'tag-chrome-platform-fixes-for-v5.7-rc2' of...

Merge tag 'tag-chrome-platform-fixes-for-v5.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux

Pull chrome-platform fixes from Benson Leung:
 "Two small fixes for cros_ec_sensorhub_ring.c, addressing issues
  introduced in the cros_ec_sensorhub FIFO support commit"

* tag 'tag-chrome-platform-fixes-for-v5.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
  platform/chrome: cros_ec_sensorhub: Add missing '\n' in log messages
  platform/chrome: cros_ec_sensorhub: Off by one in cros_sensorhub_send_sample()
parents c8372665 538b8471
...@@ -40,7 +40,7 @@ cros_sensorhub_send_sample(struct cros_ec_sensorhub *sensorhub, ...@@ -40,7 +40,7 @@ cros_sensorhub_send_sample(struct cros_ec_sensorhub *sensorhub,
int id = sample->sensor_id; int id = sample->sensor_id;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
if (id > sensorhub->sensor_num) if (id >= sensorhub->sensor_num)
return -EINVAL; return -EINVAL;
cb = sensorhub->push_data[id].push_data_cb; cb = sensorhub->push_data[id].push_data_cb;
...@@ -820,7 +820,7 @@ static void cros_ec_sensorhub_ring_handler(struct cros_ec_sensorhub *sensorhub) ...@@ -820,7 +820,7 @@ static void cros_ec_sensorhub_ring_handler(struct cros_ec_sensorhub *sensorhub)
if (fifo_info->count > sensorhub->fifo_size || if (fifo_info->count > sensorhub->fifo_size ||
fifo_info->size != sensorhub->fifo_size) { fifo_info->size != sensorhub->fifo_size) {
dev_warn(sensorhub->dev, dev_warn(sensorhub->dev,
"Mismatch EC data: count %d, size %d - expected %d", "Mismatch EC data: count %d, size %d - expected %d\n",
fifo_info->count, fifo_info->size, fifo_info->count, fifo_info->size,
sensorhub->fifo_size); sensorhub->fifo_size);
goto error; goto error;
...@@ -851,14 +851,14 @@ static void cros_ec_sensorhub_ring_handler(struct cros_ec_sensorhub *sensorhub) ...@@ -851,14 +851,14 @@ static void cros_ec_sensorhub_ring_handler(struct cros_ec_sensorhub *sensorhub)
} }
if (number_data > fifo_info->count - i) { if (number_data > fifo_info->count - i) {
dev_warn(sensorhub->dev, dev_warn(sensorhub->dev,
"Invalid EC data: too many entry received: %d, expected %d", "Invalid EC data: too many entry received: %d, expected %d\n",
number_data, fifo_info->count - i); number_data, fifo_info->count - i);
break; break;
} }
if (out + number_data > if (out + number_data >
sensorhub->ring + fifo_info->count) { sensorhub->ring + fifo_info->count) {
dev_warn(sensorhub->dev, dev_warn(sensorhub->dev,
"Too many samples: %d (%zd data) to %d entries for expected %d entries", "Too many samples: %d (%zd data) to %d entries for expected %d entries\n",
i, out - sensorhub->ring, i + number_data, i, out - sensorhub->ring, i + number_data,
fifo_info->count); fifo_info->count);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment