History

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: Initialize nbytes for internal sg commands libata: Fix ata_busy_wait() kernel docs pata_via: Correct missing comments pata_atiixp: propogate cable detection hack from drivers/ide to the new driver ahci/pata_jmicron: fix JMicron quirk

Linus Torvalds committed 19 years ago

Commit e47fddf2 parents 222335b 49c80426 files · +21 −18Browse files

Showing the changes to include (1 of 6 files). Show all

Unified · Split

include/linux/libata.h+2−0
@@ -1054,6 +1054,8 @@ static inline void ata_pause(struct ata_port *ap) · 1053 unmodified lines
10541054 /**
10551055 * ata_busy_wait - Wait for a port status register
10561056 * @ap: Port to wait for.
1057+ * @bits: bits that must be clear
1058+ * @max: number of 10uS waits to perform
10571059 *
10581060 * Waits up to max*10 microseconds for the selected bits in the port's
10591061 * status register to be cleared.