diff options
Diffstat (limited to 'drivers/ata/pata_arasan_cf.c')
-rw-r--r-- | drivers/ata/pata_arasan_cf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c index 65cee74605b4..719bb73a73e0 100644 --- a/drivers/ata/pata_arasan_cf.c +++ b/drivers/ata/pata_arasan_cf.c | |||
@@ -385,7 +385,7 @@ static inline int wait4buf(struct arasan_cf_dev *acdev) | |||
385 | return -ETIMEDOUT; | 385 | return -ETIMEDOUT; |
386 | } | 386 | } |
387 | 387 | ||
388 | /* Check if PIO Error interrupt has occured */ | 388 | /* Check if PIO Error interrupt has occurred */ |
389 | if (acdev->dma_status & ATA_DMA_ERR) | 389 | if (acdev->dma_status & ATA_DMA_ERR) |
390 | return -EAGAIN; | 390 | return -EAGAIN; |
391 | 391 | ||
@@ -450,7 +450,7 @@ static int sg_xfer(struct arasan_cf_dev *acdev, struct scatterlist *sg) | |||
450 | /* | 450 | /* |
451 | * For each sg: | 451 | * For each sg: |
452 | * MAX_XFER_COUNT data will be transferred before we get transfer | 452 | * MAX_XFER_COUNT data will be transferred before we get transfer |
453 | * complete interrupt. Inbetween after FIFO_SIZE data | 453 | * complete interrupt. Between after FIFO_SIZE data |
454 | * buffer available interrupt will be generated. At this time we will | 454 | * buffer available interrupt will be generated. At this time we will |
455 | * fill FIFO again: max FIFO_SIZE data. | 455 | * fill FIFO again: max FIFO_SIZE data. |
456 | */ | 456 | */ |
@@ -463,7 +463,7 @@ static int sg_xfer(struct arasan_cf_dev *acdev, struct scatterlist *sg) | |||
463 | acdev->vbase + XFER_CTR); | 463 | acdev->vbase + XFER_CTR); |
464 | spin_unlock_irqrestore(&acdev->host->lock, flags); | 464 | spin_unlock_irqrestore(&acdev->host->lock, flags); |
465 | 465 | ||
466 | /* continue dma xfers untill current sg is completed */ | 466 | /* continue dma xfers until current sg is completed */ |
467 | while (xfer_cnt) { | 467 | while (xfer_cnt) { |
468 | /* wait for read to complete */ | 468 | /* wait for read to complete */ |
469 | if (!write) { | 469 | if (!write) { |
@@ -563,7 +563,7 @@ static void data_xfer(struct work_struct *work) | |||
563 | 563 | ||
564 | chan_request_fail: | 564 | chan_request_fail: |
565 | spin_lock_irqsave(&acdev->host->lock, flags); | 565 | spin_lock_irqsave(&acdev->host->lock, flags); |
566 | /* error when transfering data to/from memory */ | 566 | /* error when transferring data to/from memory */ |
567 | qc->err_mask |= AC_ERR_HOST_BUS; | 567 | qc->err_mask |= AC_ERR_HOST_BUS; |
568 | qc->ap->hsm_task_state = HSM_ST_ERR; | 568 | qc->ap->hsm_task_state = HSM_ST_ERR; |
569 | 569 | ||