Module: xenomai-forge
Branch: next
Commit: c6af19b195d49daf2a85a1b0d9481631eae5ac5e
URL:    
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=c6af19b195d49daf2a85a1b0d9481631eae5ac5e

Author: Jorge Ramirez-Ortiz <j...@xenomai.org>
Date:   Sun Jul  6 12:02:58 2014 -0400

drivers/analogy: return error if wait call is interrupted

---

 kernel/drivers/analogy/buffer.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/drivers/analogy/buffer.c b/kernel/drivers/analogy/buffer.c
index 6589565..df22894 100644
--- a/kernel/drivers/analogy/buffer.c
+++ b/kernel/drivers/analogy/buffer.c
@@ -1121,8 +1121,7 @@ int a4l_ioctl_poll(struct a4l_device_context * cxt, void 
*arg)
        else {
                unsigned long long ns = ((unsigned long long)poll.arg) *
                        ((unsigned long long)NSEC_PER_MSEC);
-               ret = a4l_timedwait_sync(&(buf->sync),
-                                        rtdm_in_rt_context(), ns);
+               ret = a4l_timedwait_sync(&(buf->sync), rtdm_in_rt_context(), 
ns);
        }
 
        if (ret == 0) {
@@ -1132,6 +1131,8 @@ int a4l_ioctl_poll(struct a4l_device_context * cxt, void 
*arg)
                else
                        tmp_cnt = __count_to_put(buf);
        }
+       else
+               return ret;
 
 out_poll:
 


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git

Reply via email to