Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-08-28 18:10:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pci-current/for-linus'

Browse Source
This commit is contained in:
Stephen Rothwell 2021-05-07 08:11:34 +10:00
commit 1888052db2
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -14136,7 +14136,7 @@ M: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
R: Rob Herring <robh@kernel.org>
L: linux-pci@vger.kernel.org
S: Supported
Q: http://patchwork.ozlabs.org/project/linux-pci/list/
Q: http://patchwork.kernel.org/project/linux-pci/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git/
F: drivers/pci/controller/
@ -14144,7 +14144,7 @@ PCI SUBSYSTEM
M: Bjorn Helgaas <bhelgaas@google.com>
L: linux-pci@vger.kernel.org
S: Supported
Q: http://patchwork.ozlabs.org/project/linux-pci/list/
Q: http://patchwork.kernel.org/project/linux-pci/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
F: Documentation/PCI/
F: Documentation/devicetree/bindings/pci/

9
drivers/pci/switch/switchtec.c
View File

@ -1112,12 +1112,15 @@ static int ioctl_port_to_pff(struct switchtec_dev *stdev,
if (copy_from_user(&p, up, sizeof(p)))
return -EFAULT;
if (p.partition == SWITCHTEC_IOCTL_EVENT_LOCAL_PART_IDX)
if (p.partition == SWITCHTEC_IOCTL_EVENT_LOCAL_PART_IDX) {
pcfg = stdev->mmio_part_cfg;
else if (p.partition < stdev->partition_count)
} else if (p.partition < stdev->partition_count) {
p.partition = array_index_nospec(p.partition,
stdev->partition_count);
pcfg = &stdev->mmio_part_cfg_all[p.partition];
else
} else {
return -EINVAL;
}
switch (p.port) {
case 0: