openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'upstream-fixes' into upstream 

Conflicts:

	drivers/scsi/libata-core.c
This commit is contained in:
Jeff Garzik 2006-05-24 01:49:12 -04:00
parent d3fb4e8ddd bb31a8faa2
commit c81e29b4ac
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/libata-core.c
View File

@ -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 */
}
/**