diff options
Diffstat (limited to 'drivers/scsi/arm/acornscsi.c')
-rw-r--r-- | drivers/scsi/arm/acornscsi.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c index eceacf6d49e..3bedf2466bd 100644 --- a/drivers/scsi/arm/acornscsi.c +++ b/drivers/scsi/arm/acornscsi.c | |||
@@ -1790,7 +1790,7 @@ int acornscsi_starttransfer(AS_Host *host) | |||
1790 | return 0; | 1790 | return 0; |
1791 | } | 1791 | } |
1792 | 1792 | ||
1793 | residual = host->SCpnt->request_bufflen - host->scsi.SCp.scsi_xferred; | 1793 | residual = scsi_bufflen(host->SCpnt) - host->scsi.SCp.scsi_xferred; |
1794 | 1794 | ||
1795 | sbic_arm_write(host->scsi.io_port, SBIC_SYNCHTRANSFER, host->device[host->SCpnt->device->id].sync_xfer); | 1795 | sbic_arm_write(host->scsi.io_port, SBIC_SYNCHTRANSFER, host->device[host->SCpnt->device->id].sync_xfer); |
1796 | sbic_arm_writenext(host->scsi.io_port, residual >> 16); | 1796 | sbic_arm_writenext(host->scsi.io_port, residual >> 16); |
@@ -2270,7 +2270,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq) | |||
2270 | case 0x4b: /* -> PHASE_STATUSIN */ | 2270 | case 0x4b: /* -> PHASE_STATUSIN */ |
2271 | case 0x8b: /* -> PHASE_STATUSIN */ | 2271 | case 0x8b: /* -> PHASE_STATUSIN */ |
2272 | /* DATA IN -> STATUS */ | 2272 | /* DATA IN -> STATUS */ |
2273 | host->scsi.SCp.scsi_xferred = host->SCpnt->request_bufflen - | 2273 | host->scsi.SCp.scsi_xferred = scsi_bufflen(host->SCpnt) - |
2274 | acornscsi_sbic_xfcount(host); | 2274 | acornscsi_sbic_xfcount(host); |
2275 | acornscsi_dma_stop(host); | 2275 | acornscsi_dma_stop(host); |
2276 | acornscsi_readstatusbyte(host); | 2276 | acornscsi_readstatusbyte(host); |
@@ -2281,7 +2281,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq) | |||
2281 | case 0x4e: /* -> PHASE_MSGOUT */ | 2281 | case 0x4e: /* -> PHASE_MSGOUT */ |
2282 | case 0x8e: /* -> PHASE_MSGOUT */ | 2282 | case 0x8e: /* -> PHASE_MSGOUT */ |
2283 | /* DATA IN -> MESSAGE OUT */ | 2283 | /* DATA IN -> MESSAGE OUT */ |
2284 | host->scsi.SCp.scsi_xferred = host->SCpnt->request_bufflen - | 2284 | host->scsi.SCp.scsi_xferred = scsi_bufflen(host->SCpnt) - |
2285 | acornscsi_sbic_xfcount(host); | 2285 | acornscsi_sbic_xfcount(host); |
2286 | acornscsi_dma_stop(host); | 2286 | acornscsi_dma_stop(host); |
2287 | acornscsi_sendmessage(host); | 2287 | acornscsi_sendmessage(host); |
@@ -2291,7 +2291,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq) | |||
2291 | case 0x4f: /* message in */ | 2291 | case 0x4f: /* message in */ |
2292 | case 0x8f: /* message in */ | 2292 | case 0x8f: /* message in */ |
2293 | /* DATA IN -> MESSAGE IN */ | 2293 | /* DATA IN -> MESSAGE IN */ |
2294 | host->scsi.SCp.scsi_xferred = host->SCpnt->request_bufflen - | 2294 | host->scsi.SCp.scsi_xferred = scsi_bufflen(host->SCpnt) - |
2295 | acornscsi_sbic_xfcount(host); | 2295 | acornscsi_sbic_xfcount(host); |
2296 | acornscsi_dma_stop(host); | 2296 | acornscsi_dma_stop(host); |
2297 | acornscsi_message(host); /* -> PHASE_MSGIN, PHASE_DISCONNECT */ | 2297 | acornscsi_message(host); /* -> PHASE_MSGIN, PHASE_DISCONNECT */ |
@@ -2319,7 +2319,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq) | |||
2319 | case 0x4b: /* -> PHASE_STATUSIN */ | 2319 | case 0x4b: /* -> PHASE_STATUSIN */ |
2320 | case 0x8b: /* -> PHASE_STATUSIN */ | 2320 | case 0x8b: /* -> PHASE_STATUSIN */ |
2321 | /* DATA OUT -> STATUS */ | 2321 | /* DATA OUT -> STATUS */ |
2322 | host->scsi.SCp.scsi_xferred = host->SCpnt->request_bufflen - | 2322 | host->scsi.SCp.scsi_xferred = scsi_bufflen(host->SCpnt) - |
2323 | acornscsi_sbic_xfcount(host); | 2323 | acornscsi_sbic_xfcount(host); |
2324 | acornscsi_dma_stop(host); | 2324 | acornscsi_dma_stop(host); |
2325 | acornscsi_dma_adjust(host); | 2325 | acornscsi_dma_adjust(host); |
@@ -2331,7 +2331,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq) | |||
2331 | case 0x4e: /* -> PHASE_MSGOUT */ | 2331 | case 0x4e: /* -> PHASE_MSGOUT */ |
2332 | case 0x8e: /* -> PHASE_MSGOUT */ | 2332 | case 0x8e: /* -> PHASE_MSGOUT */ |
2333 | /* DATA OUT -> MESSAGE OUT */ | 2333 | /* DATA OUT -> MESSAGE OUT */ |
2334 | host->scsi.SCp.scsi_xferred = host->SCpnt->request_bufflen - | 2334 | host->scsi.SCp.scsi_xferred = scsi_bufflen(host->SCpnt) - |
2335 | acornscsi_sbic_xfcount(host); | 2335 | acornscsi_sbic_xfcount(host); |
2336 | acornscsi_dma_stop(host); | 2336 | acornscsi_dma_stop(host); |
2337 | acornscsi_dma_adjust(host); | 2337 | acornscsi_dma_adjust(host); |
@@ -2342,7 +2342,7 @@ intr_ret_t acornscsi_sbicintr(AS_Host *host, int in_irq) | |||
2342 | case 0x4f: /* message in */ | 2342 | case 0x4f: /* message in */ |
2343 | case 0x8f: /* message in */ | 2343 | case 0x8f: /* message in */ |
2344 | /* DATA OUT -> MESSAGE IN */ | 2344 | /* DATA OUT -> MESSAGE IN */ |
2345 | host->scsi.SCp.scsi_xferred = host->SCpnt->request_bufflen - | 2345 | host->scsi.SCp.scsi_xferred = scsi_bufflen(host->SCpnt) - |
2346 | acornscsi_sbic_xfcount(host); | 2346 | acornscsi_sbic_xfcount(host); |
2347 | acornscsi_dma_stop(host); | 2347 | acornscsi_dma_stop(host); |
2348 | acornscsi_dma_adjust(host); | 2348 | acornscsi_dma_adjust(host); |