From d21b9158b300d06ef52062bc2d97a9f07a86cd7b Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Fri, 2 Mar 2007 08:45:21 +0000
Subject: [PATCH] Fixed possible race with next request pointer again.
---
master/fsm_master.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/master/fsm_master.c b/master/fsm_master.c
index 4c8a0c2d..25ace736 100644
--- a/master/fsm_master.c
+++ b/master/fsm_master.c
@@ -284,11 +284,19 @@ int ec_fsm_master_action_process_eeprom(
)
{
ec_master_t *master = fsm->master;
- ec_eeprom_write_request_t *request, *next;
+ ec_eeprom_write_request_t *request;
ec_slave_t *slave;
- down(&master->eeprom_sem);
- list_for_each_entry_safe(request, next, &master->eeprom_requests, list) {
+ // search the first request to be processed
+ while (1) {
+ down(&master->eeprom_sem);
+ if (list_empty(&master->eeprom_requests)) {
+ up(&master->eeprom_sem);
+ break;
+ }
+ // get first request
+ request = list_entry(master->eeprom_requests.next,
+ ec_eeprom_write_request_t, list);
list_del_init(&request->list); // dequeue
up(&master->eeprom_sem);
@@ -298,7 +306,6 @@ int ec_fsm_master_action_process_eeprom(
slave->ring_position);
request->state = EC_EEPROM_REQ_ERROR;
wake_up_interruptible(&master->eeprom_queue);
- down(&master->eeprom_sem);
continue;
}
@@ -313,7 +320,6 @@ int ec_fsm_master_action_process_eeprom(
return 1;
}
- up(&master->eeprom_sem);
return 0;
}
--
GitLab