# HG changeset patch
# User Martin Troxler <martin.troxler@komaxgroup.com>
# Date 1262611051 -3600
# Node ID d46de2278ac617d2d396fab125c62ddaa5052586
# Parent  be4dd9c80f42f44584dc7573d24047a11df5bfd3# Parent  94010c6d8198e81a15fc6beeb444f8c3f919c2c2
Merged

diff -r be4dd9c80f42 -r d46de2278ac6 master/fsm_slave.c
--- a/master/fsm_slave.c	Mon Jan 04 14:16:53 2010 +0100
+++ b/master/fsm_slave.c	Mon Jan 04 14:17:31 2010 +0100
@@ -282,8 +282,8 @@
         EC_DBG("Failed to process SDO request for slave %u.\n",
                 fsm->slave->ring_position);
         request->state = EC_INT_REQUEST_FAILURE;
-		wake_up(&slave->foe_queue);
-		fsm->foe_request = NULL;
+		wake_up(&slave->sdo_queue);
+		fsm->sdo_request = NULL;
 		fsm->state = ec_fsm_slave_state_idle;
         return;
     }