diff options
| author | David S. Miller <davem@davemloft.net> | 2013-06-06 23:39:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-06 23:39:26 -0700 |
| commit | 93a306aef5eef70e524500884ccca52c5dd19e17 (patch) | |
| tree | 13baf4c01c6cc86c5b5c1294fd0b9d05c85eedce /arch/x86 | |
| parent | 4df95131ea803bcb94f472d465c73ed57015c470 (diff) | |
| parent | 1612e111e4e565422242727efb59499cce8738e4 (diff) | |
| download | op-kernel-dev-93a306aef5eef70e524500884ccca52c5dd19e17.zip op-kernel-dev-93a306aef5eef70e524500884ccca52c5dd19e17.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge 'net' into 'net-next' to get the MSG_CMSG_COMPAT
regression fix.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/pci/common.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 305c68b..981c2db 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -628,7 +628,9 @@ int pcibios_add_device(struct pci_dev *dev) pa_data = boot_params.hdr.setup_data; while (pa_data) { - data = phys_to_virt(pa_data); + data = ioremap(pa_data, sizeof(*rom)); + if (!data) + return -ENOMEM; if (data->type == SETUP_PCI) { rom = (struct pci_setup_rom *)data; @@ -645,6 +647,7 @@ int pcibios_add_device(struct pci_dev *dev) } } pa_data = data->next; + iounmap(data); } return 0; } |
