summaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2007-10-10 03:09:12 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-11-02 08:44:09 -0700
commitc0d96d06ef796e7c7d2fd11333c907e81f8b047b (patch)
tree356e8c881a0c2b4799813c4e1f554161ba6698d5 /drivers/scsi
parentf310d0f08fdf2c9ed846ddcb958c50507c7833b9 (diff)
downloadlinux-stable-c0d96d06ef796e7c7d2fd11333c907e81f8b047b.tar.gz
linux-stable-c0d96d06ef796e7c7d2fd11333c907e81f8b047b.tar.bz2
linux-stable-c0d96d06ef796e7c7d2fd11333c907e81f8b047b.zip
Fix ESP host instance numbering.
changeset ff4abd6cfacf0bb23a077f615d3a5cd17359db1b in mainline. The ESP scsi driver does not initialize the host controller instance early enough, so the messages in the log confuse users. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/esp_scsi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index 71caf2ded6ba..150beaf3fe88 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -2318,6 +2318,7 @@ int __devinit scsi_esp_register(struct esp *esp, struct device *dev)
esp->host->transportt = esp_transport_template;
esp->host->max_lun = ESP_MAX_LUN;
esp->host->cmd_per_lun = 2;
+ esp->host->unique_id = instance;
esp_set_clock_params(esp);
@@ -2341,7 +2342,7 @@ int __devinit scsi_esp_register(struct esp *esp, struct device *dev)
if (err)
return err;
- esp->host->unique_id = instance++;
+ instance++;
scsi_scan_host(esp->host);