]> git.baikalelectronics.ru Git - kernel.git/commit
PCI: hisi: Fix deferred probing
authorArnd Bergmann <arnd@arndb.de>
Tue, 24 Nov 2015 21:38:07 +0000 (15:38 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 24 Nov 2015 21:38:07 +0000 (15:38 -0600)
commit783777f0b12151d3b036c2702a4ddfa3da4d30ff
tree3f7926a60c9c1410d43dd6917d9750fe82a692e5
parent0087173eaadf116d0899cdc227245c8880af26a9
PCI: hisi: Fix deferred probing

The hisi_pcie_probe() function is incorrectly marked as __init, as Kconfig
tells us:

  WARNING: drivers/pci/host/built-in.o(.data+0x7780): Section mismatch in reference from the variable hisi_pcie_driver to the function .init.text:hisi_pcie_probe()

If the probe for this device gets deferred past the point where __init
functions are removed, or the device is unbound and then reattached to the
driver, we branch into uninitialized memory, which is bad.

Remove the __init annotation from hisi_pcie_probe() and
hisi_add_pcie_port().

Fixes: bdbc51eea902 ("PCI: hisi: Add HiSilicon SoC Hip05 PCIe driver")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
Acked-by: Zhou Wang <wangzhou1@hisilicon.com>
drivers/pci/host/pcie-hisi.c