diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-24 03:59:14 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-24 03:59:14 (GMT) |
| commit | 75befb31ec3cfc74bc502b034b67cc07e1eac6f7 (patch) | |
| tree | ced8e97691334703ba26388f203efd6d061ce537 | |
| parent | da01e18a37a57f360222d3a123b8f6994aa1ad14 (diff) | |
| parent | ef0dab4aae14e25efddf1577736f8450132800c5 (diff) | |
| download | linux-75befb31ec3cfc74bc502b034b67cc07e1eac6f7.tar.xz | |
Merge tag 'pci-v4.7-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas:
"Here's a small fix for v4.7. This problem was actually introduced in
v4.6 when we unified Kconfig, making PCIe support available everywhere
including sparc, where config reads into unaligned buffers cause
warnings. This fix is from Dave Miller.
As a reminder, any future PCI fixes for v4.7 will probably come from
Alex Williamson, since I'll be on vacation for most of the rest of
this cycle. I should be back about the time the merge window opens"
* tag 'pci-v4.7-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: Fix unaligned accesses in VC code
| -rw-r--r-- | drivers/pci/vc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/vc.c b/drivers/pci/vc.c index dfbab61..1fa3a32 100644 --- a/drivers/pci/vc.c +++ b/drivers/pci/vc.c @@ -221,9 +221,9 @@ static int pci_vc_do_save_buffer(struct pci_dev *dev, int pos, else pci_write_config_word(dev, pos + PCI_VC_PORT_CTRL, *(u16 *)buf); - buf += 2; + buf += 4; } - len += 2; + len += 4; /* * If we have any Low Priority VCs and a VC Arbitration Table Offset |