diff --git a/qla2x00t/qla_bsg.c b/qla2x00t/qla_bsg.c
index 1b5922dfc..8d9b8244b 100644
--- a/qla2x00t/qla_bsg.c
+++ b/qla2x00t/qla_bsg.c
@@ -1594,7 +1594,7 @@ qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
 	default:
 		bsg_job->reply->result = (DID_ERROR << 16);
 		bsg_job->job_done(bsg_job);
-		return -ENOSYS;
+		return -ENOTSUPP;
 	}
 }
 
diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index 15b199e4b..5d471d4cf 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -7612,7 +7612,7 @@ static int vdisk_create_bioset(struct scst_vdisk_dev *virt_dev)
 		/* The same, pool size doesn't really matter */
 		res = bioset_integrity_create(virt_dev->vdisk_bioset, 2);
 #else
-		res = -ENOSYS;
+		res = -ENOTSUPP;
 #endif
 		if (res != 0) {
 			PRINT_ERROR("Failed to create integrity bioset "
diff --git a/scst/src/scst_proc.c b/scst/src/scst_proc.c
index a7f2169b5..1d4dc3c25 100644
--- a/scst/src/scst_proc.c
+++ b/scst/src/scst_proc.c
@@ -1399,7 +1399,7 @@ static ssize_t scst_proc_scsi_tgt_write(struct file *file,
 	TRACE_ENTRY();
 
 	if (vtt->tgtt->write_proc == NULL) {
-		res = -ENOSYS;
+		res = -ENOTSUPP;
 		goto out;
 	}
 
@@ -1554,7 +1554,7 @@ static ssize_t scst_proc_scsi_dev_handler_write(struct file *file,
 	TRACE_ENTRY();
 
 	if (dev_type->write_proc == NULL) {
-		res = -ENOSYS;
+		res = -ENOTSUPP;
 		goto out;
 	}