equal
deleted
inserted
replaced
847 ) |
847 ) |
848 { |
848 { |
849 ec_slave_t *slave = container_of(kobj, ec_slave_t, kobj); |
849 ec_slave_t *slave = container_of(kobj, ec_slave_t, kobj); |
850 |
850 |
851 if (attr == &attr_state) { |
851 if (attr == &attr_state) { |
|
852 char state[25]; |
852 if (!strcmp(buffer, "INIT\n")) |
853 if (!strcmp(buffer, "INIT\n")) |
853 slave->requested_state = EC_SLAVE_STATE_INIT; |
854 slave->requested_state = EC_SLAVE_STATE_INIT; |
854 else if (!strcmp(buffer, "PREOP\n")) |
855 else if (!strcmp(buffer, "PREOP\n")) |
855 slave->requested_state = EC_SLAVE_STATE_PREOP; |
856 slave->requested_state = EC_SLAVE_STATE_PREOP; |
856 else if (!strcmp(buffer, "SAVEOP\n")) |
857 else if (!strcmp(buffer, "SAVEOP\n")) |
860 else { |
861 else { |
861 EC_ERR("Invalid slave state \"%s\"!\n", buffer); |
862 EC_ERR("Invalid slave state \"%s\"!\n", buffer); |
862 return -EINVAL; |
863 return -EINVAL; |
863 } |
864 } |
864 |
865 |
|
866 ec_state_string(slave->requested_state, state); |
865 EC_INFO("Accepted new state %s for slave %i.\n", |
867 EC_INFO("Accepted new state %s for slave %i.\n", |
866 buffer, slave->ring_position); |
868 state, slave->ring_position); |
867 slave->error_flag = 0; |
869 slave->error_flag = 0; |
868 return size; |
870 return size; |
869 } |
871 } |
870 else if (attr == &attr_eeprom) { |
872 else if (attr == &attr_eeprom) { |
871 if (!ec_slave_write_eeprom(slave, buffer, size)) |
873 if (!ec_slave_write_eeprom(slave, buffer, size)) |