diff --git a/[refs] b/[refs]
index 869da5d52de3..e532660e1cb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a70757ba9a3719f99760713c3b72134b21016c6e
+refs/heads/master: 91e6ecada757a6e2ef7b937634af8a04376772a1
diff --git a/trunk/drivers/scsi/stex.c b/trunk/drivers/scsi/stex.c
index 3058bb1aff95..fd7b15be7640 100644
--- a/trunk/drivers/scsi/stex.c
+++ b/trunk/drivers/scsi/stex.c
@@ -623,6 +623,11 @@ stex_queuecommand(struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd *))
 		}
 		break;
 	case INQUIRY:
+		if (lun >= host->max_lun) {
+			cmd->result = DID_NO_CONNECT << 16;
+			done(cmd);
+			return 0;
+		}
 		if (id != host->max_id - 1)
 			break;
 		if (!lun && !cmd->device->channel &&