equal
deleted
inserted
replaced
41 |
41 |
42 /*****************************************************************************/ |
42 /*****************************************************************************/ |
43 |
43 |
44 int ec_master_count = 1; |
44 int ec_master_count = 1; |
45 ec_master_t *ec_masters = NULL; |
45 ec_master_t *ec_masters = NULL; |
46 int *ec_masters_reserved = NULL; |
46 unsigned int *ec_masters_reserved = NULL; |
47 |
47 |
48 /*****************************************************************************/ |
48 /*****************************************************************************/ |
49 |
49 |
50 MODULE_AUTHOR ("Florian Pose <fp@igh-essen.com>"); |
50 MODULE_AUTHOR ("Florian Pose <fp@igh-essen.com>"); |
51 MODULE_DESCRIPTION ("EtherCAT master driver module"); |
51 MODULE_DESCRIPTION ("EtherCAT master driver module"); |
86 EC_ERR("Could not allocate memory for EtherCAT master(s)!\n"); |
86 EC_ERR("Could not allocate memory for EtherCAT master(s)!\n"); |
87 return -1; |
87 return -1; |
88 } |
88 } |
89 |
89 |
90 if ((ec_masters_reserved = |
90 if ((ec_masters_reserved = |
91 (int *) kmalloc(sizeof(int) * ec_master_count, GFP_KERNEL)) == NULL) { |
91 (unsigned int *) kmalloc(sizeof(int) * ec_master_count, |
|
92 GFP_KERNEL)) == NULL) { |
92 EC_ERR("Could not allocate memory for reservation flags!\n"); |
93 EC_ERR("Could not allocate memory for reservation flags!\n"); |
93 kfree(ec_masters); |
94 kfree(ec_masters); |
94 return -1; |
95 return -1; |
95 } |
96 } |
96 |
97 |