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 | |
| parent | d3fb4e8dddebbf7d6c0b02842c619bfd4fa199f5 (diff) | |
| parent | bb31a8faa270beafcc51a65880c5564c6b718bd6 (diff) | |
| download | linux-c81e29b4aca2b2503238276219d97faaac994b4f.tar.gz | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/libata-core.c
Diffstat (limited to 'drivers')
| -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 bf00d2b2e404c..e891b83be10fd 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) * ata_pio_sectors - Transfer one or many 512-byte sectors. * @qc: Command on going * - * Transfer one or many ATA_SECT_SIZE of data from/to the + * Transfer one or many ATA_SECT_SIZE of data from/to the * ATA device for the DRQ request. * * LOCKING: @@ -3973,6 +3973,8 @@ static void ata_hsm_qc_complete(struct ata_queued_cmd *qc, int in_wq) } else ata_qc_complete(qc); } + + ata_altstatus(ap); /* flush */ } /** |