Skip to content

Commit 56e4f2d

Browse files
gwendalcrjic23
authored andcommitted
iio: cros_ec: Use default frequencies when EC returns invalid information
Minimal and maximal frequencies supported by a sensor is queried. On some older machines, these frequencies are not returned properly and the EC returns 0 instead. When returned maximal frequency is 0, ignore the information and use default frequencies instead. Fixes: ae7b02a ("iio: common: cros_ec_sensors: Expose cros_ec_sensors frequency range via iio sysfs") Signed-off-by: Gwendal Grignou <gwendal@chromium.org> Reviewed-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Link: https://lore.kernel.org/r/20200630153730.3302889-1-gwendal@chromium.org CC: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
1 parent 7e97e4c commit 56e4f2d

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ int cros_ec_sensors_core_init(struct platform_device *pdev,
256256
struct cros_ec_sensorhub *sensor_hub = dev_get_drvdata(dev->parent);
257257
struct cros_ec_dev *ec = sensor_hub->ec;
258258
struct cros_ec_sensor_platform *sensor_platform = dev_get_platdata(dev);
259-
u32 ver_mask;
259+
u32 ver_mask, temp;
260260
int frequencies[ARRAY_SIZE(state->frequencies) / 2] = { 0 };
261261
int ret, i;
262262

@@ -311,10 +311,16 @@ int cros_ec_sensors_core_init(struct platform_device *pdev,
311311
&frequencies[2],
312312
&state->fifo_max_event_count);
313313
} else {
314-
frequencies[1] = state->resp->info_3.min_frequency;
315-
frequencies[2] = state->resp->info_3.max_frequency;
316-
state->fifo_max_event_count =
317-
state->resp->info_3.fifo_max_event_count;
314+
if (state->resp->info_3.max_frequency == 0) {
315+
get_default_min_max_freq(state->resp->info.type,
316+
&frequencies[1],
317+
&frequencies[2],
318+
&temp);
319+
} else {
320+
frequencies[1] = state->resp->info_3.min_frequency;
321+
frequencies[2] = state->resp->info_3.max_frequency;
322+
}
323+
state->fifo_max_event_count = state->resp->info_3.fifo_max_event_count;
318324
}
319325
for (i = 0; i < ARRAY_SIZE(frequencies); i++) {
320326
state->frequencies[2 * i] = frequencies[i] / 1000;

0 commit comments

Comments
 (0)