diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 20:18:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-15 20:18:10 +0200 |
| commit | b312bf359e20cc39c00d480fd40a24c245d80bf7 (patch) | |
| tree | 756247f113688403cf35d1d7437fc92d390279d2 /drivers/ata/pata_qdi.c | |
| parent | Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 (diff) | |
| parent | AHCI: Remove an unnecessary flush from ahci_qc_issue (diff) | |
| download | linux-b312bf359e20cc39c00d480fd40a24c245d80bf7.tar.xz linux-b312bf359e20cc39c00d480fd40a24c245d80bf7.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
AHCI: Remove an unnecessary flush from ahci_qc_issue
AHCI: speed up resume
[libata] Add support for VPD page b1
ata: endianness annotations in pata drivers
libata-eh: update atapi_eh_request_sense() to take @dev instead of @qc
[libata] sata_svw: update code comments relating to data corruption
libata/ahci: enclosure management support
libata: improve EH internal command timeout handling
libata: use ULONG_MAX to terminate reset timeout table
libata: improve EH retry delay handling
libata: consistently use msecs for time durations
Diffstat (limited to 'drivers/ata/pata_qdi.c')
| -rw-r--r-- | drivers/ata/pata_qdi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_qdi.c b/drivers/ata/pata_qdi.c index 97e5b090d7c2..63b7a1c165a5 100644 --- a/drivers/ata/pata_qdi.c +++ b/drivers/ata/pata_qdi.c @@ -137,7 +137,7 @@ static unsigned int qdi_data_xfer(struct ata_device *dev, unsigned char *buf, iowrite32_rep(ap->ioaddr.data_addr, buf, buflen >> 2); if (unlikely(slop)) { - u32 pad; + __le32 pad; if (rw == READ) { pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr)); memcpy(buf + buflen - slop, &pad, slop); |