From b44aeaaf3cfc9c4902293a795ca8964b7c2d808f Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Thu, 12 Jun 2008 13:03:50 +0000
Subject: [PATCH] Minor change.
---
master/fsm_master.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/master/fsm_master.c b/master/fsm_master.c
index ea7ccb2e..2b73cdfc 100644
--- a/master/fsm_master.c
+++ b/master/fsm_master.c
@@ -183,7 +183,7 @@ void ec_fsm_master_state_broadcast(
)
{
ec_datagram_t *datagram = fsm->datagram;
- unsigned int i;
+ unsigned int i, size;
ec_slave_t *slave;
ec_master_t *master = fsm->master;
@@ -241,10 +241,10 @@ void ec_fsm_master_state_broadcast(
return;
}
- if (!(master->slaves = (ec_slave_t *)
- kmalloc(sizeof(ec_slave_t) * master->slave_count,
- GFP_KERNEL))) {
- EC_ERR("Failed to allocate slave memory!\n");
+ size = sizeof(ec_slave_t) * master->slave_count;
+ if (!(master->slaves = (ec_slave_t *) kmalloc(size, GFP_KERNEL))) {
+ EC_ERR("Failed to allocate %u bytes of slave memory!\n",
+ size);
master->slave_count = 0; // FIXME avoid scanning!
master->scan_busy = 0;
wake_up_interruptible(&master->scan_queue);
--
GitLab