Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6] / drivers / scsi / hosts.c

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 112ab6abe62bf513cd7f2b25926fdab9571f0304..24271a871b8c6a03c8cc971d823527374732e52e 100644 (file)
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -345,6 +345,12 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
        shost->active_mode = sht->supported_mode;
        shost->use_sg_chaining = sht->use_sg_chaining;
 
+       if (sht->supported_mode == MODE_UNKNOWN)
+               /* means we didn't set it ... default to INITIATOR */
+               shost->active_mode = MODE_INITIATOR;
+       else
+               shost->active_mode = sht->supported_mode;
+
        if (sht->max_host_blocked)
                shost->max_host_blocked = sht->max_host_blocked;
        else