equal
deleted
inserted
replaced
241 return; |
241 return; |
242 } |
242 } |
243 |
243 |
244 // init slaves |
244 // init slaves |
245 for (i = 0; i < master->slave_count; i++) { |
245 for (i = 0; i < master->slave_count; i++) { |
246 if (!(slave = (ec_slave_t *) kmalloc(sizeof(ec_slave_t), |
246 if (!(slave = (ec_slave_t *) |
247 GFP_ATOMIC))) { |
247 kmalloc(sizeof(ec_slave_t), GFP_KERNEL))) { |
248 EC_ERR("Failed to allocate slave %u!\n", i); |
248 EC_ERR("Failed to allocate slave %u!\n", i); |
249 ec_master_clear_slaves(master); |
249 ec_master_clear_slaves(master); |
250 master->scan_busy = 0; |
250 master->scan_busy = 0; |
251 wake_up_interruptible(&master->scan_queue); |
251 wake_up_interruptible(&master->scan_queue); |
252 fsm->state = ec_fsm_master_state_error; |
252 fsm->state = ec_fsm_master_state_error; |