summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-04-09 18:31:59 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2022-04-09 18:31:59 -1000
commit94a4c2bb7a1fb95bd7105ac5685377f57c13daf3 (patch)
tree125bb95bbbdb1eeab61a4f0e4fce07d49fa02fd5 /drivers
parentfa3b895da8e06d6e3dcf3e6941a3fd428343e3d7 (diff)
parentd28820419ca332f856cdf8bef0cafed79c29ed05 (diff)
downloadlinux-94a4c2bb7a1fb95bd7105ac5685377f57c13daf3.tar.bz2
Merge tag 'cxl+nvdimm-for-5.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull cxl and nvdimm fixes from Dan Williams: - Fix a compile error in the nvdimm unit tests - Fix a shadowed variable warning in the CXL PCI driver * tag 'cxl+nvdimm-for-5.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: cxl/pci: Drop shadowed variable tools/testing/nvdimm: Fix security_init() symbol collision
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cxl/pci.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
index 8a7267d116b7..3f2182d66829 100644
--- a/drivers/cxl/pci.c
+++ b/drivers/cxl/pci.c
@@ -436,7 +436,6 @@ static int wait_for_media_ready(struct cxl_dev_state *cxlds)
for (i = mbox_ready_timeout; i; i--) {
u32 temp;
- int rc;
rc = pci_read_config_dword(
pdev, d + CXL_DVSEC_RANGE_SIZE_LOW(0), &temp);