git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
amd74xx: don't change UDMA settings when programming PIO timings
[safe/jmp/linux-2.6]
/
drivers
/
ide
/
scc_pata.c
diff --git
a/drivers/ide/scc_pata.c
b/drivers/ide/scc_pata.c
index
5be41f2
..
1104bb3
100644
(file)
--- a/
drivers/ide/scc_pata.c
+++ b/
drivers/ide/scc_pata.c
@@
-559,7
+559,7
@@
static int scc_ide_setup_pci_device(struct pci_dev *dev,
{
struct scc_ports *ports = pci_get_drvdata(dev);
struct ide_host *host;
{
struct scc_ports *ports = pci_get_drvdata(dev);
struct ide_host *host;
-
hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL
};
+
struct ide_hw hw, *hws[] = { &hw
};
int i, rc;
memset(&hw, 0, sizeof(hw));
int i, rc;
memset(&hw, 0, sizeof(hw));
@@
-567,9
+567,8
@@
static int scc_ide_setup_pci_device(struct pci_dev *dev,
hw.io_ports_array[i] = ports->dma + 0x20 + i * 4;
hw.irq = dev->irq;
hw.dev = &dev->dev;
hw.io_ports_array[i] = ports->dma + 0x20 + i * 4;
hw.irq = dev->irq;
hw.dev = &dev->dev;
- hw.chipset = ide_pci;
- rc = ide_host_add(d, hws, &host);
+ rc = ide_host_add(d, hws,
1,
&host);
if (rc)
return rc;
if (rc)
return rc;
@@
-823,6
+822,7
@@
static const struct ide_port_info scc_chipset __devinitdata = {
.host_flags = IDE_HFLAG_SINGLE,
.irq_flags = IRQF_SHARED,
.pio_mask = ATA_PIO4,
.host_flags = IDE_HFLAG_SINGLE,
.irq_flags = IRQF_SHARED,
.pio_mask = ATA_PIO4,
+ .chipset = ide_pci,
};
/**
};
/**