diff options
Diffstat (limited to 'drivers/firewire/core-transaction.c')
| -rw-r--r-- | drivers/firewire/core-transaction.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c index b8f6db6a0494..182da69eae44 100644 --- a/drivers/firewire/core-transaction.c +++ b/drivers/firewire/core-transaction.c | |||
| @@ -1026,19 +1026,17 @@ static void handle_registers(struct fw_card *card, struct fw_request *request, | |||
| 1026 | case CSR_BUS_TIME: | 1026 | case CSR_BUS_TIME: |
| 1027 | case CSR_BUSY_TIMEOUT: | 1027 | case CSR_BUSY_TIMEOUT: |
| 1028 | if (tcode == TCODE_READ_QUADLET_REQUEST) | 1028 | if (tcode == TCODE_READ_QUADLET_REQUEST) |
| 1029 | *data = cpu_to_be32(card->driver-> | 1029 | *data = cpu_to_be32(card->driver->read_csr(card, reg)); |
| 1030 | read_csr_reg(card, reg)); | ||
| 1031 | else if (tcode == TCODE_WRITE_QUADLET_REQUEST) | 1030 | else if (tcode == TCODE_WRITE_QUADLET_REQUEST) |
| 1032 | card->driver->write_csr_reg(card, reg, | 1031 | card->driver->write_csr(card, reg, be32_to_cpu(*data)); |
| 1033 | be32_to_cpu(*data)); | ||
| 1034 | else | 1032 | else |
| 1035 | rcode = RCODE_TYPE_ERROR; | 1033 | rcode = RCODE_TYPE_ERROR; |
| 1036 | break; | 1034 | break; |
| 1037 | 1035 | ||
| 1038 | case CSR_RESET_START: | 1036 | case CSR_RESET_START: |
| 1039 | if (tcode == TCODE_WRITE_QUADLET_REQUEST) | 1037 | if (tcode == TCODE_WRITE_QUADLET_REQUEST) |
| 1040 | card->driver->write_csr_reg(card, CSR_STATE_CLEAR, | 1038 | card->driver->write_csr(card, CSR_STATE_CLEAR, |
| 1041 | CSR_STATE_BIT_ABDICATE); | 1039 | CSR_STATE_BIT_ABDICATE); |
| 1042 | else | 1040 | else |
| 1043 | rcode = RCODE_TYPE_ERROR; | 1041 | rcode = RCODE_TYPE_ERROR; |
| 1044 | break; | 1042 | break; |