Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 00:14:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: sensor: fix lsm6dso get a null pointer in non-fifo mode.

Browse Source 
CHAMPION-63

get the parent pointer in front of the batch.

Change-Id: Ie309c6df942ecd3ae0f87966fe68053fe4fe4520
Signed-off-by: yangjiukui <yangjiukui@xiaomi.com>
This commit is contained in:
yangjiukui
2021-08-24 15:57:42 +08:00
parent 2862e57495
commit cc07094c69
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/sensors/lsm6dso.c
+14 -3
View File
@@ -2485,6 +2485,20 @@ static int lsm6dso_batch(FAR struct sensor_lowerhalf_s *lower,
*latency_us = sensor->fifowtm * sensor->interval;
sensor->batch = *latency_us;
if (lower->type == SENSOR_TYPE_ACCELEROMETER)
{
priv = (struct lsm6dso_dev_s *)(sensor - LSM6DSO_XL_IDX);
}
else if(lower->type == SENSOR_TYPE_GYROSCOPE)
{
priv = (struct lsm6dso_dev_s *)(sensor - LSM6DSO_GY_IDX);
}
else
{
snerr("Failed to match sensor type.\n");
return -EINVAL;
}
if (sensor->fifowtm > 1)
{
sensor->fifoen = true;
@@ -2497,13 +2511,10 @@ static int lsm6dso_batch(FAR struct sensor_lowerhalf_s *lower,
if (lower->type == SENSOR_TYPE_ACCELEROMETER)
{
priv = (struct lsm6dso_dev_s *)(sensor - LSM6DSO_XL_IDX);
lsm6dso_fifo_xl_setbatch(priv, g_lsm6dso_xl_bdr[idx].regval);
}
else if(lower->type == SENSOR_TYPE_GYROSCOPE)
{
priv = (struct lsm6dso_dev_s *)(sensor - LSM6DSO_GY_IDX);
lsm6dso_fifo_gy_setbatch(priv, g_lsm6dso_gy_bdr[idx].regval);
}
else