git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
[pandora-kernel.git]
/
drivers
/
ata
/
pata_winbond.c
diff --git
a/drivers/ata/pata_winbond.c
b/drivers/ata/pata_winbond.c
index
549cbbe
..
7116a9e
100644
(file)
--- a/
drivers/ata/pata_winbond.c
+++ b/
drivers/ata/pata_winbond.c
@@
-104,14
+104,12
@@
static void winbond_data_xfer(struct ata_device *adev, unsigned char *buf, unsig
ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
if (unlikely(slop)) {
ioread32_rep(ap->ioaddr.data_addr, buf, buflen >> 2);
if (unlikely(slop)) {
-
u32 pad
;
+
__le32 pad = 0
;
if (write_data) {
memcpy(&pad, buf + buflen - slop, slop);
if (write_data) {
memcpy(&pad, buf + buflen - slop, slop);
- pad = le32_to_cpu(pad);
- iowrite32(pad, ap->ioaddr.data_addr);
+ iowrite32(le32_to_cpu(pad), ap->ioaddr.data_addr);
} else {
} else {
- pad = ioread32(ap->ioaddr.data_addr);
- pad = cpu_to_le16(pad);
+ pad = cpu_to_le32(ioread32(ap->ioaddr.data_addr));
memcpy(buf + buflen - slop, &pad, slop);
}
}
memcpy(buf + buflen - slop, &pad, slop);
}
}
@@
-279,7
+277,7
@@
static __init int winbond_init(void)
if (request_region(port, 2, "pata_winbond")) {
ret = winbond_init_one(port);
if (request_region(port, 2, "pata_winbond")) {
ret = winbond_init_one(port);
- if(ret <= 0)
+ if
(ret <= 0)
release_region(port, 2);
else ct+= ret;
}
release_region(port, 2);
else ct+= ret;
}