equal
deleted
inserted
replaced
2472 } |
2472 } |
2473 |
2473 |
2474 up(&master->master_sem); // FIXME |
2474 up(&master->master_sem); // FIXME |
2475 |
2475 |
2476 ret = ecrt_slave_config_idn( |
2476 ret = ecrt_slave_config_idn( |
2477 sc, ioctl.idn, ioctl.al_state, data, ioctl.size); |
2477 sc, ioctl.drive_no, ioctl.idn, ioctl.al_state, data, ioctl.size); |
2478 kfree(data); |
2478 kfree(data); |
2479 return ret; |
2479 return ret; |
2480 } |
2480 } |
2481 |
2481 |
2482 /*****************************************************************************/ |
2482 /*****************************************************************************/ |
3342 ioctl.mem_size); |
3342 ioctl.mem_size); |
3343 return -ENOMEM; |
3343 return -ENOMEM; |
3344 } |
3344 } |
3345 |
3345 |
3346 retval = ecrt_master_read_idn(master, ioctl.slave_position, |
3346 retval = ecrt_master_read_idn(master, ioctl.slave_position, |
3347 ioctl.idn, data, ioctl.mem_size, &ioctl.data_size, |
3347 ioctl.drive_no, ioctl.idn, data, ioctl.mem_size, &ioctl.data_size, |
3348 &ioctl.error_code); |
3348 &ioctl.error_code); |
3349 if (retval) { |
3349 if (retval) { |
3350 kfree(data); |
3350 kfree(data); |
3351 return retval; |
3351 return retval; |
3352 } |
3352 } |
3393 kfree(data); |
3393 kfree(data); |
3394 return -EFAULT; |
3394 return -EFAULT; |
3395 } |
3395 } |
3396 |
3396 |
3397 retval = ecrt_master_write_idn(master, ioctl.slave_position, |
3397 retval = ecrt_master_write_idn(master, ioctl.slave_position, |
3398 ioctl.idn, data, ioctl.data_size, &ioctl.error_code); |
3398 ioctl.drive_no, ioctl.idn, data, ioctl.data_size, |
|
3399 &ioctl.error_code); |
3399 kfree(data); |
3400 kfree(data); |
3400 if (retval) { |
3401 if (retval) { |
3401 return retval; |
3402 return retval; |
3402 } |
3403 } |
3403 |
3404 |