From: David Miller <davem@davemloft.net>
Date: Sat, 25 Aug 2007 05:25:58 +0000 (-0700)
Subject: [SCSI] esp: fix instance numbering.
X-Git-Tag: v2.6.23-rc9~39^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ff4abd6cfacf0bb23a077f615d3a5cd17359db1b;p=linux-2.6-omap-h63xx.git

[SCSI] esp: fix instance numbering.

Because the ->unique_id is set too late, the ESP scsi host
instance numbers in the kernel log during probing are
wrong.

Bug reported by Meelis Roos.

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index 77b06a983fa..95cf7b6cd62 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -2314,6 +2314,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);
 
@@ -2337,7 +2338,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);