diff options
author | Jon Mason <jdmason@kudzu.us> | 2011-06-28 19:26:25 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-07-22 12:06:51 -0400 |
commit | c9b378c7cbf623649e4ca64f955f2afd12ef01b2 (patch) | |
tree | 2fde509dd86d2548c5bdb8d00413bda8b513897f /drivers/pci/pci.c | |
parent | 0cab0841dc1400f633a7e1ac1e448518692f927a (diff) |
PCI: correct pcie_set_readrq write size
When setting the PCI-E MRRS, pcie_set_readrq queries the current
settings via a pci_read_config_word call but writes the modified result
via a pci_write_config_dword. This results in writing 16 more bits than
were queried.
Also, the function description comment is slightly incorrect.
Signed-off-by: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/pci.c')
-rw-r--r-- | drivers/pci/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index d549bbc93cdd..08a95b369d85 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -3191,7 +3191,7 @@ EXPORT_SYMBOL(pcie_get_readrq); | |||
3191 | * @rq: maximum memory read count in bytes | 3191 | * @rq: maximum memory read count in bytes |
3192 | * valid values are 128, 256, 512, 1024, 2048, 4096 | 3192 | * valid values are 128, 256, 512, 1024, 2048, 4096 |
3193 | * | 3193 | * |
3194 | * If possible sets maximum read byte count | 3194 | * If possible sets maximum memory read request in bytes |
3195 | */ | 3195 | */ |
3196 | int pcie_set_readrq(struct pci_dev *dev, int rq) | 3196 | int pcie_set_readrq(struct pci_dev *dev, int rq) |
3197 | { | 3197 | { |
@@ -3214,7 +3214,7 @@ int pcie_set_readrq(struct pci_dev *dev, int rq) | |||
3214 | if ((ctl & PCI_EXP_DEVCTL_READRQ) != v) { | 3214 | if ((ctl & PCI_EXP_DEVCTL_READRQ) != v) { |
3215 | ctl &= ~PCI_EXP_DEVCTL_READRQ; | 3215 | ctl &= ~PCI_EXP_DEVCTL_READRQ; |
3216 | ctl |= v; | 3216 | ctl |= v; |
3217 | err = pci_write_config_dword(dev, cap + PCI_EXP_DEVCTL, ctl); | 3217 | err = pci_write_config_word(dev, cap + PCI_EXP_DEVCTL, ctl); |
3218 | } | 3218 | } |
3219 | 3219 | ||
3220 | out: | 3220 | out: |