diff options
Diffstat (limited to 'drivers/firewire/sbp2.c')
-rw-r--r-- | drivers/firewire/sbp2.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/firewire/sbp2.c b/drivers/firewire/sbp2.c index 7e33b0b1704c..ae715c82da2e 100644 --- a/drivers/firewire/sbp2.c +++ b/drivers/firewire/sbp2.c | |||
@@ -508,8 +508,7 @@ static void sbp2_send_orb(struct sbp2_orb *orb, struct sbp2_logical_unit *lu, | |||
508 | 508 | ||
509 | fw_send_request(device->card, &orb->t, TCODE_WRITE_BLOCK_REQUEST, | 509 | fw_send_request(device->card, &orb->t, TCODE_WRITE_BLOCK_REQUEST, |
510 | node_id, generation, device->max_speed, offset, | 510 | node_id, generation, device->max_speed, offset, |
511 | &orb->pointer, sizeof(orb->pointer), | 511 | &orb->pointer, 8, complete_transaction, orb); |
512 | complete_transaction, orb); | ||
513 | } | 512 | } |
514 | 513 | ||
515 | static int sbp2_cancel_orbs(struct sbp2_logical_unit *lu) | 514 | static int sbp2_cancel_orbs(struct sbp2_logical_unit *lu) |
@@ -654,7 +653,7 @@ static void sbp2_agent_reset(struct sbp2_logical_unit *lu) | |||
654 | fw_run_transaction(device->card, TCODE_WRITE_QUADLET_REQUEST, | 653 | fw_run_transaction(device->card, TCODE_WRITE_QUADLET_REQUEST, |
655 | lu->tgt->node_id, lu->generation, device->max_speed, | 654 | lu->tgt->node_id, lu->generation, device->max_speed, |
656 | lu->command_block_agent_address + SBP2_AGENT_RESET, | 655 | lu->command_block_agent_address + SBP2_AGENT_RESET, |
657 | &d, sizeof(d)); | 656 | &d, 4); |
658 | } | 657 | } |
659 | 658 | ||
660 | static void complete_agent_reset_write_no_wait(struct fw_card *card, | 659 | static void complete_agent_reset_write_no_wait(struct fw_card *card, |
@@ -676,7 +675,7 @@ static void sbp2_agent_reset_no_wait(struct sbp2_logical_unit *lu) | |||
676 | fw_send_request(device->card, t, TCODE_WRITE_QUADLET_REQUEST, | 675 | fw_send_request(device->card, t, TCODE_WRITE_QUADLET_REQUEST, |
677 | lu->tgt->node_id, lu->generation, device->max_speed, | 676 | lu->tgt->node_id, lu->generation, device->max_speed, |
678 | lu->command_block_agent_address + SBP2_AGENT_RESET, | 677 | lu->command_block_agent_address + SBP2_AGENT_RESET, |
679 | &d, sizeof(d), complete_agent_reset_write_no_wait, t); | 678 | &d, 4, complete_agent_reset_write_no_wait, t); |
680 | } | 679 | } |
681 | 680 | ||
682 | static inline void sbp2_allow_block(struct sbp2_logical_unit *lu) | 681 | static inline void sbp2_allow_block(struct sbp2_logical_unit *lu) |
@@ -866,8 +865,7 @@ static void sbp2_set_busy_timeout(struct sbp2_logical_unit *lu) | |||
866 | 865 | ||
867 | fw_run_transaction(device->card, TCODE_WRITE_QUADLET_REQUEST, | 866 | fw_run_transaction(device->card, TCODE_WRITE_QUADLET_REQUEST, |
868 | lu->tgt->node_id, lu->generation, device->max_speed, | 867 | lu->tgt->node_id, lu->generation, device->max_speed, |
869 | CSR_REGISTER_BASE + CSR_BUSY_TIMEOUT, | 868 | CSR_REGISTER_BASE + CSR_BUSY_TIMEOUT, &d, 4); |
870 | &d, sizeof(d)); | ||
871 | } | 869 | } |
872 | 870 | ||
873 | static void sbp2_reconnect(struct work_struct *work); | 871 | static void sbp2_reconnect(struct work_struct *work); |