etherlabmaster: comparison master/slave.c

equal deleted inserted replaced

-:b3b1f4ce590c
+:a6ce861a167e
 const uint16_t *data_words, *next_header;
 uint16_t *new_data;
 if (slave->master->mode != EC_MASTER_MODE_IDLE) {
 EC_ERR("Writing EEPROMs only allowed in idle mode!\n");
-return -1;
+return -EACCES;
 }
 if (slave->new_eeprom_data) {
 EC_ERR("Slave %i already has a pending EEPROM write operation!\n",
 slave->ring_position);
-return -1;
+return -EBUSY;
 }
 // coarse check of the data
 if (size % 2) {
 EC_ERR("EEPROM size is odd! Dropping.\n");
-return -1;
+return -EINVAL;
 }
 data_words = (const uint16_t *) data;
 word_size = size / 2;
 if (word_size < 0x0041) {
 EC_ERR("EEPROM data too short! Dropping.\n");
-return -1;
+return -EINVAL;
 }
 next_header = data_words + 0x0040;
 cat_type = EC_READ_U16(next_header);
 while (cat_type != 0xFFFF) {
 cat_type = EC_READ_U16(next_header);
 cat_size = EC_READ_U16(next_header + 1);
 if ((next_header + cat_size + 2) - data_words >= word_size) {
 EC_ERR("EEPROM data seems to be corrupted! Dropping.\n");
-return -1;
+return -EINVAL;
 }
 next_header += cat_size + 2;
 cat_type = EC_READ_U16(next_header);
 }
 // data ok!
 if (!(new_data = (uint16_t *) kmalloc(word_size * 2, GFP_KERNEL))) {
 EC_ERR("Unable to allocate memory for new EEPROM data!\n");
-return -1;
+return -ENOMEM;
 }
 memcpy(new_data, data, size);
 slave->new_eeprom_size = word_size;
 slave->new_eeprom_data = new_data;
 EC_INFO("EEPROM writing scheduled for slave %i, %i words.\n",
 slave->ring_position, word_size);
-return 0;
+return size;
 }
 /*****************************************************************************/
 /**
 EC_INFO("Accepted new state %s for slave %i.\n",
 state, slave->ring_position);
 return size;
 }
 else if (attr == &attr_eeprom) {
-if (!ec_slave_write_eeprom(slave, buffer, size))
+return ec_slave_write_eeprom(slave, buffer, size);
-return size;
 }
 return -EINVAL;
 }

changeset 599	a6ce861a167e
parent 597	3a2c2d6ca5e9
child 601	d6d951b766e3