Commit 7c50f221 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cxl-fixes-6.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl 

Pull cxl fix from Ira Weiny:

 - Fix calculation for SBDF in error injection

* tag 'cxl-fixes-6.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl:
  EINJ, CXL: Fix CXL device SBDF calculation
parents 3a28c9e1 ee1e3c46

drivers/acpi/apei/einj-cxl.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static int cxl_dport_get_sbdf(struct pci_dev *dport_dev, u64 *sbdf) 
		seg = bridge->domain_nr;



	bus = pbus->number;

	*sbdf = (seg << 24) | (bus << 16) | dport_dev->devfn;

	*sbdf = (seg << 24) | (bus << 16) | (dport_dev->devfn << 8);



	return 0;

}