diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-11 21:50:54 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-11 21:50:54 +0200 |
| commit | d3ea693439833b5ed9b932512e9a90b9381035c9 (patch) | |
| tree | 7abf66035b35ba6e8df31aae67b7e0c6be6f551c /arch/m68k/coldfire | |
| parent | Merge tag 'mailbox-v5.8' of git://git.linaro.org/landing-teams/working/fujits... (diff) | |
| parent | m68k,nommu: fix implicit cast from __user in __{get,put}_user_asm() (diff) | |
| download | linux-d3ea693439833b5ed9b932512e9a90b9381035c9.tar.xz linux-d3ea693439833b5ed9b932512e9a90b9381035c9.zip | |
Merge tag 'm68knommu-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
- casting clean up in the user access macros
- memory leak on error case fix for PCI probing
- update of a defconfig
* tag 'm68knommu-for-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68k,nommu: fix implicit cast from __user in __{get,put}_user_asm()
m68k,nommu: add missing __user in uaccess' __ptr() macro
m68k: Drop CONFIG_MTD_M25P80 in stmark2_defconfig
m68k/PCI: Fix a memory leak in an error handling path
Diffstat (limited to 'arch/m68k/coldfire')
| -rw-r--r-- | arch/m68k/coldfire/pci.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m68k/coldfire/pci.c b/arch/m68k/coldfire/pci.c index 62b0eb6cf69a..84eab0f5e00a 100644 --- a/arch/m68k/coldfire/pci.c +++ b/arch/m68k/coldfire/pci.c @@ -216,8 +216,10 @@ static int __init mcf_pci_init(void) /* Keep a virtual mapping to IO/config space active */ iospace = (unsigned long) ioremap(PCI_IO_PA, PCI_IO_SIZE); - if (iospace == 0) + if (iospace == 0) { + pci_free_host_bridge(bridge); return -ENODEV; + } pr_info("Coldfire: PCI IO/config window mapped to 0x%x\n", (u32) iospace); |