diff options
author | ethanhsiao@jmicron.com <ethanhsiao@jmicron.com> | 2007-01-30 17:36:13 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-30 19:01:35 -0500 |
commit | 99abaf51e25f7d4ac2081e5cdc1f01baa0543514 (patch) | |
tree | 11686bc5f5056a9fb0467eeaf0868ae5141a1b3d /drivers | |
parent | c06bb5d49d8b240876c7c5019197e6a7bd33bcf7 (diff) |
[PATCH] jmicron: 40/80pin primary detection
jmicron module detects all JMB36x as JMB361 and PATA0 has wrong pin status
of XICBLID.
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/ide/pci/jmicron.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c index 35dda8fcd0ac..f07bbbed1778 100644 --- a/drivers/ide/pci/jmicron.c +++ b/drivers/ide/pci/jmicron.c | |||
@@ -86,8 +86,8 @@ static int __devinit ata66_jmicron(ide_hwif_t *hwif) | |||
86 | { | 86 | { |
87 | case PORT_PATA0: | 87 | case PORT_PATA0: |
88 | if (control & (1 << 3)) /* 40/80 pin primary */ | 88 | if (control & (1 << 3)) /* 40/80 pin primary */ |
89 | return 1; | 89 | return 0; |
90 | return 0; | 90 | return 1; |
91 | case PORT_PATA1: | 91 | case PORT_PATA1: |
92 | if (control5 & (1 << 19)) /* 40/80 pin secondary */ | 92 | if (control5 & (1 << 19)) /* 40/80 pin secondary */ |
93 | return 0; | 93 | return 0; |
@@ -241,11 +241,11 @@ static int __devinit jmicron_init_one(struct pci_dev *dev, const struct pci_devi | |||
241 | } | 241 | } |
242 | 242 | ||
243 | static struct pci_device_id jmicron_pci_tbl[] = { | 243 | static struct pci_device_id jmicron_pci_tbl[] = { |
244 | { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361), 0}, | 244 | { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB361, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
245 | { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363), 1}, | 245 | { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB363, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1}, |
246 | { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365), 2}, | 246 | { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB365, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2}, |
247 | { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366), 3}, | 247 | { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB366, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 3}, |
248 | { PCI_DEVICE(PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368), 4}, | 248 | { PCI_VENDOR_ID_JMICRON, PCI_DEVICE_ID_JMICRON_JMB368, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4}, |
249 | { 0, }, | 249 | { 0, }, |
250 | }; | 250 | }; |
251 | 251 | ||