aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Le Goater <clg@kaod.org>2018-07-05 01:26:23 -0400
committerMartin K. Petersen <martin.petersen@oracle.com>2018-07-10 22:29:54 -0400
commit943e59fe78ee870d86c775fc9fee2ab68bd262a3 (patch)
treec1722694d96e514cdd397974ba18325c16c29530
parenta3440d0d2f57f7ba102fc332086961cf261180af (diff)
scsi: cxlflash: fix assignment of the backend operations
commit cd43c221bb5e ("scsi: cxlflash: Isolate external module dependencies") introduced the use of ifdefs to avoid compilation errors when one of the possible backend driver, CXL or OCXL, is not compiled. Unfortunately, the wrong defines are used and the backend ops are never assigned, leading to a kernel crash in any case when the cxlflash module is loaded. Signed-off-by: Cédric Le Goater <clg@kaod.org> Acked-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r--drivers/scsi/cxlflash/main.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/cxlflash/main.h b/drivers/scsi/cxlflash/main.h
index 2a3977823812..a39be94d110c 100644
--- a/drivers/scsi/cxlflash/main.h
+++ b/drivers/scsi/cxlflash/main.h
@@ -107,12 +107,12 @@ cxlflash_assign_ops(struct dev_dependent_vals *ddv)
107{ 107{
108 const struct cxlflash_backend_ops *ops = NULL; 108 const struct cxlflash_backend_ops *ops = NULL;
109 109
110#ifdef CONFIG_OCXL 110#ifdef CONFIG_OCXL_BASE
111 if (ddv->flags & CXLFLASH_OCXL_DEV) 111 if (ddv->flags & CXLFLASH_OCXL_DEV)
112 ops = &cxlflash_ocxl_ops; 112 ops = &cxlflash_ocxl_ops;
113#endif 113#endif
114 114
115#ifdef CONFIG_CXL 115#ifdef CONFIG_CXL_BASE
116 if (!(ddv->flags & CXLFLASH_OCXL_DEV)) 116 if (!(ddv->flags & CXLFLASH_OCXL_DEV))
117 ops = &cxlflash_cxl_ops; 117 ops = &cxlflash_cxl_ops;
118#endif 118#endif