diff options
author | Linus Torvalds | 2020-05-06 16:40:14 -0700 |
---|---|---|
committer | Linus Torvalds | 2020-05-06 16:40:14 -0700 |
commit | b9388959ba507c7a48ac18e4aa3b63b8a910ed99 (patch) | |
tree | 3cc8a186c187dfee2c15d941d4cb099aa4c1f39b /include | |
parent | 3c40cdb0e93ec166f1fa4fee1eb62d45b5451515 (diff) | |
parent | b31d1d2b1c3a8452f425b09ebd374ecd3ddd5179 (diff) |
Merge tag 'tag-chrome-platform-fixes-for-v5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux
Pull chrome platform fix from Benson Leung:
"Fix a resource allocation issue in cros_ec_sensorhub.c"
* tag 'tag-chrome-platform-fixes-for-v5.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux:
platform/chrome: cros_ec_sensorhub: Allocate sensorhub resource before claiming sensors
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/platform_data/cros_ec_sensorhub.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/platform_data/cros_ec_sensorhub.h b/include/linux/platform_data/cros_ec_sensorhub.h index c588be843f61..0ecce6aa69d5 100644 --- a/include/linux/platform_data/cros_ec_sensorhub.h +++ b/include/linux/platform_data/cros_ec_sensorhub.h @@ -185,6 +185,7 @@ int cros_ec_sensorhub_register_push_data(struct cros_ec_sensorhub *sensorhub, void cros_ec_sensorhub_unregister_push_data(struct cros_ec_sensorhub *sensorhub, u8 sensor_num); +int cros_ec_sensorhub_ring_allocate(struct cros_ec_sensorhub *sensorhub); int cros_ec_sensorhub_ring_add(struct cros_ec_sensorhub *sensorhub); void cros_ec_sensorhub_ring_remove(void *arg); int cros_ec_sensorhub_ring_fifo_enable(struct cros_ec_sensorhub *sensorhub, |