This is an automated email from the ASF dual-hosted git repository.

xiaoxiang781216 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit 7fc9ed5c96785affd0c87dfb3c629e66ad4d77db
Author: dongjiuzhu1 <[email protected]>
AuthorDate: Wed Oct 30 14:14:28 2024 +0800

    drivers/sensors/sensor_rpmsg: Forward unhandled ioctl to remote core.
    
    When the local driver implements control() but does not handle the
    command and returns -ENOTTY, sensor_rpmsg_control() returned that
    error directly, so the ioctl issued by orb_ioctl() never reached the
    remote core that owns the sensor.
    
    Forward the command to the remote core when the local control()
    returns -ENOTTY, in the same way as when no local control() exists.
    
    Signed-off-by: dongjiuzhu1 <[email protected]>
---
 drivers/sensors/sensor_rpmsg.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/sensors/sensor_rpmsg.c b/drivers/sensors/sensor_rpmsg.c
index 5f172cf35cc..8272c63d1b7 100644
--- a/drivers/sensors/sensor_rpmsg.c
+++ b/drivers/sensors/sensor_rpmsg.c
@@ -876,18 +876,21 @@ static int sensor_rpmsg_control(FAR struct 
sensor_lowerhalf_s *lower,
   FAR struct sensor_rpmsg_dev_s *dev = lower->priv;
   FAR struct sensor_lowerhalf_s *drv = dev->drv;
   FAR struct sensor_ioctl_s *ioctl = (FAR void *)(uintptr_t)arg;
+  int ret = -ENOTTY;
 
   if (drv->ops->control)
     {
-      return drv->ops->control(drv, filep, cmd, arg);
+      ret = drv->ops->control(drv, filep, cmd, arg);
     }
-  else if (!(filep->f_oflags & SENSOR_REMOTE) && _SNIOCVALID(cmd))
+
+  if (ret == -ENOTTY && !(filep->f_oflags & SENSOR_REMOTE) &&
+      _SNIOCVALID(cmd))
     {
       return sensor_rpmsg_ioctl(dev, cmd, arg,
                                 sizeof(*ioctl) + ioctl->len, true);
     }
 
-  return -ENOTTY;
+  return ret;
 }
 
 static void sensor_rpmsg_data_worker(FAR void *arg)

Reply via email to