diff --git a/[refs] b/[refs]
index 063ec6ebc0b2..1bf41ffd5e1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1acf3b06f77a48b1607534408866473fb8018a65
+refs/heads/master: 832151f45806613f203c4c0308c1566d882b971f
diff --git a/trunk/drivers/scsi/st.c b/trunk/drivers/scsi/st.c
index 12d58a7ed6bc..ad59abb47722 100644
--- a/trunk/drivers/scsi/st.c
+++ b/trunk/drivers/scsi/st.c
@@ -2280,7 +2280,8 @@ static int st_set_options(struct scsi_tape *STp, long options)
 	} else if (code == MT_ST_SET_CLN) {
 		value = (options & ~MT_ST_OPTIONS) & 0xff;
 		if (value != 0 &&
-		    value < EXTENDED_SENSE_START && value >= SCSI_SENSE_BUFFERSIZE)
+			(value < EXTENDED_SENSE_START ||
+				value >= SCSI_SENSE_BUFFERSIZE))
 			return (-EINVAL);
 		STp->cln_mode = value;
 		STp->cln_sense_mask = (options >> 8) & 0xff;