diff options
| author | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-23 03:31:06 -0500 |
| commit | 51c24aaacaea90c8e87f1dec75a2ac7622b593f8 (patch) | |
| tree | 9f54936c87764bef75e97395cb56b7d1e0df24c6 /drivers/scsi/stex.c | |
| parent | 4276e47e2d1c85a2477caf0d22b91c4f2377fba8 (diff) | |
| parent | 6be325719b3e54624397e413efd4b33a997e55a3 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/scsi/stex.c')
| -rw-r--r-- | drivers/scsi/stex.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c index 3058bb1aff95..fd7b15be7640 100644 --- a/drivers/scsi/stex.c +++ b/drivers/scsi/stex.c | |||
| @@ -623,6 +623,11 @@ stex_queuecommand(struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd *)) | |||
| 623 | } | 623 | } |
| 624 | break; | 624 | break; |
| 625 | case INQUIRY: | 625 | case INQUIRY: |
| 626 | if (lun >= host->max_lun) { | ||
| 627 | cmd->result = DID_NO_CONNECT << 16; | ||
| 628 | done(cmd); | ||
| 629 | return 0; | ||
| 630 | } | ||
| 626 | if (id != host->max_id - 1) | 631 | if (id != host->max_id - 1) |
| 627 | break; | 632 | break; |
| 628 | if (!lun && !cmd->device->channel && | 633 | if (!lun && !cmd->device->channel && |