diff options
| author | Tejun Heo <tj@kernel.org> | 2008-12-09 17:13:19 +0900 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-12-16 05:40:32 -0500 |
| commit | bab5b32a537edc83ff86bff91e46f328339f49f8 (patch) | |
| tree | e6a33ecc8968c1e822ce08d9ffe79a72ae239eb1 /drivers/ata | |
| parent | d10d491f842243e2e3bf5a2714020f9d649e1e38 (diff) | |
| download | kernel_samsung_aries-bab5b32a537edc83ff86bff91e46f328339f49f8.zip kernel_samsung_aries-bab5b32a537edc83ff86bff91e46f328339f49f8.tar.gz kernel_samsung_aries-bab5b32a537edc83ff86bff91e46f328339f49f8.tar.bz2 | |
pata_hpt366: fix cable detection,
pata_hpt366 is strange in that its two channels occupy two PCI
functions and both are primary channels and bit1 of PCI configuration
register 0x5A indicates cable for both channels.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_hpt366.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c index a098ba8..4824821 100644 --- a/drivers/ata/pata_hpt366.c +++ b/drivers/ata/pata_hpt366.c @@ -211,11 +211,15 @@ static u32 hpt36x_find_mode(struct ata_port *ap, int speed) static int hpt36x_cable_detect(struct ata_port *ap) { - u8 ata66; struct pci_dev *pdev = to_pci_dev(ap->host->dev); + u8 ata66; + /* + * Each channel of pata_hpt366 occupies separate PCI function + * as the primary channel and bit1 indicates the cable type. + */ pci_read_config_byte(pdev, 0x5A, &ata66); - if (ata66 & (1 << ap->port_no)) + if (ata66 & 2) return ATA_CBL_PATA40; return ATA_CBL_PATA80; } |