From 69535906b86032b91bed6c359326c71041ceb0c7 Mon Sep 17 00:00:00 2001 From: Jisheng Zhang Date: Thu, 23 May 2019 19:20:37 +0800 Subject: [PATCH] PCI/AER: Change pci_aer_init() stub to return void mainline inclusion from mainline-5.1-rc1 commit 31f996efbd5a category: bugfix bugzilla: 16043 CVE: NA ------------------------------------------------- Commit 60ed982a4e78 ("PCI/AER: Move internal declarations to drivers/pci/pci.h") changed pci_aer_init() to return "void", but didn't change the stub for when CONFIG_PCIEAER isn't enabled. Change the stub to match. Fixes: 60ed982a4e78 ("PCI/AER: Move internal declarations to drivers/pci/pci.h") Signed-off-by: Jisheng Zhang Signed-off-by: Bjorn Helgaas CC: stable@vger.kernel.org # v4.19+ Signed-off-by: Xiongfeng Wang Reviewed-by: Yao Hongbo Signed-off-by: Yang Yingliang --- drivers/pci/pci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 4656f91c5a2e..bca3fe3f8358 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@ -541,7 +541,7 @@ void pci_aer_clear_fatal_status(struct pci_dev *dev); void pci_aer_clear_device_status(struct pci_dev *dev); #else static inline void pci_no_aer(void) { } -static inline int pci_aer_init(struct pci_dev *d) { return -ENODEV; } +static inline void pci_aer_init(struct pci_dev *d) { } static inline void pci_aer_exit(struct pci_dev *d) { } static inline void pci_aer_clear_fatal_status(struct pci_dev *dev) { } static inline void pci_aer_clear_device_status(struct pci_dev *dev) { } -- GitLab