diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 10:08:04 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-04 10:08:08 +1000 |
| commit | 7c52ca1bcf6de1f87533ac5f6f419245f7011f46 (patch) | |
| tree | 513e1abc699dc7bc8d5c904bdc4da0370db47552 /drivers/pci/hotplug/pciehp_hpc.c | |
| parent | 42295913f01b82e576b46c63ffb1f38f814e5e62 (diff) | |
| parent | 7222f5a6f537eb4639d9dfe0fc7ceeb7c4278c62 (diff) | |
Merge commit 'pci/linux-next'
Conflicts:
arch/powerpc/kernel/pci_64.c
Diffstat (limited to 'drivers/pci/hotplug/pciehp_hpc.c')
| -rw-r--r-- | drivers/pci/hotplug/pciehp_hpc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 52813257e5bf..271f917b6f2c 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c @@ -693,7 +693,10 @@ static int hpc_get_max_lnk_speed(struct slot *slot, enum pci_bus_speed *value) switch (lnk_cap & 0x000F) { case 1: - lnk_speed = PCIE_2PT5GB; + lnk_speed = PCIE_2_5GB; + break; + case 2: + lnk_speed = PCIE_5_0GB; break; default: lnk_speed = PCIE_LNK_SPEED_UNKNOWN; @@ -772,7 +775,10 @@ static int hpc_get_cur_lnk_speed(struct slot *slot, enum pci_bus_speed *value) switch (lnk_status & PCI_EXP_LNKSTA_CLS) { case 1: - lnk_speed = PCIE_2PT5GB; + lnk_speed = PCIE_2_5GB; + break; + case 2: + lnk_speed = PCIE_5_0GB; break; default: lnk_speed = PCIE_LNK_SPEED_UNKNOWN; |