equal
deleted
inserted
replaced
511 ec_master_t *master = device->master; |
511 ec_master_t *master = device->master; |
512 char dev_str[20], mac_str[20]; |
512 char dev_str[20], mac_str[20]; |
513 |
513 |
514 ec_mac_print(device->dev->dev_addr, mac_str); |
514 ec_mac_print(device->dev->dev_addr, mac_str); |
515 |
515 |
516 if (device == &master->main_device) { |
516 if (device == &master->devices[EC_DEVICE_MAIN]) { |
517 sprintf(dev_str, "main"); |
517 sprintf(dev_str, "main"); |
518 } else if (device == &master->backup_device) { |
518 } else if (device == &master->devices[EC_DEVICE_BACKUP]) { |
519 sprintf(dev_str, "backup"); |
519 sprintf(dev_str, "backup"); |
520 } else { |
520 } else { |
521 EC_MASTER_WARN(master, "%s() called with unknown device %s!\n", |
521 EC_MASTER_WARN(master, "%s() called with unknown device %s!\n", |
522 __func__, mac_str); |
522 __func__, mac_str); |
523 sprintf(dev_str, "UNKNOWN"); |
523 sprintf(dev_str, "UNKNOWN"); |
546 if (ret) { |
546 if (ret) { |
547 EC_MASTER_ERR(master, "Failed to open device!\n"); |
547 EC_MASTER_ERR(master, "Failed to open device!\n"); |
548 return ret; |
548 return ret; |
549 } |
549 } |
550 |
550 |
551 if (master->main_device.open && |
551 if (master->devices[EC_DEVICE_MAIN].open && |
552 (ec_mac_is_zero(master->backup_mac) || |
552 (ec_mac_is_zero(master->macs[EC_DEVICE_BACKUP]) || |
553 master->backup_device.open)) { |
553 master->devices[EC_DEVICE_BACKUP].open)) { |
554 ret = ec_master_enter_idle_phase(device->master); |
554 ret = ec_master_enter_idle_phase(device->master); |
555 if (ret) { |
555 if (ret) { |
556 EC_MASTER_ERR(device->master, "Failed to enter IDLE phase!\n"); |
556 EC_MASTER_ERR(device->master, "Failed to enter IDLE phase!\n"); |
557 return ret; |
557 return ret; |
558 } |
558 } |