diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-05-24 01:49:12 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-24 01:49:12 -0400 |
commit | c81e29b4aca2b2503238276219d97faaac994b4f (patch) | |
tree | 02ec800bd9e2625b89757e2ba59f3b3c0f7c1236 /drivers/scsi/libata-core.c | |
parent | d3fb4e8dddebbf7d6c0b02842c619bfd4fa199f5 (diff) | |
parent | bb31a8faa270beafcc51a65880c5564c6b718bd6 (diff) |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/libata-core.c
Diffstat (limited to 'drivers/scsi/libata-core.c')
-rw-r--r-- | drivers/scsi/libata-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index bf00d2b2e404..e891b83be10f 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c | |||
@@ -3696,7 +3696,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc) | |||
3696 | * ata_pio_sectors - Transfer one or many 512-byte sectors. | 3696 | * ata_pio_sectors - Transfer one or many 512-byte sectors. |
3697 | * @qc: Command on going | 3697 | * @qc: Command on going |
3698 | * | 3698 | * |
3699 | * Transfer one or many ATA_SECT_SIZE of data from/to the | 3699 | * Transfer one or many ATA_SECT_SIZE of data from/to the |
3700 | * ATA device for the DRQ request. | 3700 | * ATA device for the DRQ request. |
3701 | * | 3701 | * |
3702 | * LOCKING: | 3702 | * LOCKING: |
@@ -3973,6 +3973,8 @@ static void ata_hsm_qc_complete(struct ata_queued_cmd *qc, int in_wq) | |||
3973 | } else | 3973 | } else |
3974 | ata_qc_complete(qc); | 3974 | ata_qc_complete(qc); |
3975 | } | 3975 | } |
3976 | |||
3977 | ata_altstatus(ap); /* flush */ | ||
3976 | } | 3978 | } |
3977 | 3979 | ||
3978 | /** | 3980 | /** |