master/module.c
branchstable-1.4
changeset 1648 3e46fbb7eb1d
parent 1189 acc6430bfb32
child 1685 399ef727bf62
equal deleted inserted replaced
1647:dd648d1786e9 1648:3e46fbb7eb1d
   130         if (i < backup_count && ec_mac_parse(macs[i][1], backup_devices[i], 1)) {
   130         if (i < backup_count && ec_mac_parse(macs[i][1], backup_devices[i], 1)) {
   131             ret = -EINVAL;
   131             ret = -EINVAL;
   132             goto out_class;
   132             goto out_class;
   133         }
   133         }
   134     }
   134     }
       
   135 
       
   136     // initialize static master variables
       
   137     ec_master_init_static();
   135     
   138     
   136     if (master_count) {
   139     if (master_count) {
   137         if (!(masters = kmalloc(sizeof(ec_master_t) * master_count,
   140         if (!(masters = kmalloc(sizeof(ec_master_t) * master_count,
   138                         GFP_KERNEL))) {
   141                         GFP_KERNEL))) {
   139             EC_ERR("Failed to allocate memory for EtherCAT masters.\n");
   142             EC_ERR("Failed to allocate memory for EtherCAT masters.\n");