Commit bcccaa0a authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/misc' 

- Register notifier if core_init_notifier is enabled in pci-epf-test
  (Kunihiko Hayashi)

- Fixup Kconfig indentation (Shunsuke Mie)

* remotes/lorenzo/pci/misc:
  PCI: endpoint: Fix Kconfig indent style
  PCI: pci-epf-test: Register notifier if only core_init_notifier is enabled
parents ba7deaa2 2759ddf7

drivers/pci/endpoint/functions/pci-epf-test.c

+1 −1
Original line number Diff line number Diff line
@@ -979,7 +979,7 @@ static int pci_epf_test_bind(struct pci_epf *epf) 
	if (ret)

		epf_test->dma_supported = false;



	if (linkup_notifier) {

	if (linkup_notifier || core_init_notifier) {

		epf->nb.notifier_call = pci_epf_test_notifier;

		pci_epc_register_notifier(epc, &epf->nb);

	} else {

drivers/pci/endpoint/functions/Kconfig

+9 −9

File changed.

Contains only whitespace changes.