diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-07 14:14:49 -0400 |
commit | 42933bac11e811f02200c944d8562a15f8ec4ff0 (patch) | |
tree | fcdd9afe56eb0e746565ddd1f92f22d36678b843 /drivers/ata/pata_bf54x.c | |
parent | 2b9accbee563f535046ff2cd382d0acaa92e130c (diff) | |
parent | 25985edcedea6396277003854657b5f3cb31a628 (diff) |
Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6
* 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6:
Fix common misspellings
Diffstat (limited to 'drivers/ata/pata_bf54x.c')
-rw-r--r-- | drivers/ata/pata_bf54x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c index e0b58b8dfe6f..ea64967000ff 100644 --- a/drivers/ata/pata_bf54x.c +++ b/drivers/ata/pata_bf54x.c | |||
@@ -1342,7 +1342,7 @@ static unsigned int bfin_ata_host_intr(struct ata_port *ap, | |||
1342 | ap->ops->bmdma_stop(qc); | 1342 | ap->ops->bmdma_stop(qc); |
1343 | 1343 | ||
1344 | if (unlikely(host_stat & ATA_DMA_ERR)) { | 1344 | if (unlikely(host_stat & ATA_DMA_ERR)) { |
1345 | /* error when transfering data to/from memory */ | 1345 | /* error when transferring data to/from memory */ |
1346 | qc->err_mask |= AC_ERR_HOST_BUS; | 1346 | qc->err_mask |= AC_ERR_HOST_BUS; |
1347 | ap->hsm_task_state = HSM_ST_ERR; | 1347 | ap->hsm_task_state = HSM_ST_ERR; |
1348 | } | 1348 | } |