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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
ata
/
pata_cs5535.c
diff --git
a/drivers/ata/pata_cs5535.c
b/drivers/ata/pata_cs5535.c
index
a02e645
..
03a9318
100644
(file)
--- a/
drivers/ata/pata_cs5535.c
+++ b/
drivers/ata/pata_cs5535.c
@@
-198,7
+198,7
@@
static int cs5535_init_one(struct pci_dev *dev, const struct pci_device_id *id)
rdmsr(ATAC_CH0D1_PIO, timings, dummy);
if (CS5535_BAD_PIO(timings))
wrmsr(ATAC_CH0D1_PIO, 0xF7F4F7F4UL, 0);
rdmsr(ATAC_CH0D1_PIO, timings, dummy);
if (CS5535_BAD_PIO(timings))
wrmsr(ATAC_CH0D1_PIO, 0xF7F4F7F4UL, 0);
- return ata_pci_
sff
_init_one(dev, ppi, &cs5535_sht, NULL, 0);
+ return ata_pci_
bmdma
_init_one(dev, ppi, &cs5535_sht, NULL, 0);
}
static const struct pci_device_id cs5535[] = {
}
static const struct pci_device_id cs5535[] = {