From 048fa5f0f465fb88c1b67f14ee16fee971172549 Mon Sep 17 00:00:00 2001 From: mp49 Date: Fri, 20 May 2011 17:17:27 +0000 Subject: [PATCH] motor: fixed return status for deferred moves in the XPS driver. This prevents error being sent to IOC console. --- motorApp/NewportSrc/drvXPSAsyn.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/motorApp/NewportSrc/drvXPSAsyn.c b/motorApp/NewportSrc/drvXPSAsyn.c index 80890f31..94da24c6 100644 --- a/motorApp/NewportSrc/drvXPSAsyn.c +++ b/motorApp/NewportSrc/drvXPSAsyn.c @@ -814,6 +814,8 @@ static int motorAxisSetDouble(AXIS_HDL pAxis, motorAxisParam_t function, double if (status) { PRINT(pAxis->logParam, MOTOR_ERROR, "Deferred moved failed on XPS %d, status=%d\n", pAxis->card, status); ret_status = MOTOR_AXIS_ERROR; + } else { + ret_status = MOTOR_AXIS_OK; } break; } @@ -876,6 +878,8 @@ static int motorAxisSetInteger(AXIS_HDL pAxis, motorAxisParam_t function, int va if (status) { PRINT(pAxis->logParam, MOTOR_ERROR, "Deferred moved failed on XPS %d, status=%d\n", pAxis->card, status); ret_status = MOTOR_AXIS_ERROR; + } else { + ret_status = MOTOR_AXIS_OK; } break; }