Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff4abd6c authored by David Miller's avatar David Miller Committed by James Bottomley
Browse files

[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: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 2302827c

drivers/scsi/esp_scsi.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -2314,6 +2314,7 @@ int __devinit scsi_esp_register(struct esp *esp, struct device *dev) 
	esp->host->transportt = esp_transport_template;

	esp->host->transportt = esp_transport_template;

	esp->host->max_lun = ESP_MAX_LUN;

	esp->host->max_lun = ESP_MAX_LUN;

	esp->host->cmd_per_lun = 2;

	esp->host->cmd_per_lun = 2;

	esp->host->unique_id = instance;





	esp_set_clock_params(esp);

	esp_set_clock_params(esp);
@@ -2337,7 +2338,7 @@ int __devinit scsi_esp_register(struct esp *esp, struct device *dev) 
	if (err)

	if (err)

		return err;

		return err;





	esp->host->unique_id = instance++;

	instance++;





	scsi_scan_host(esp->host);

	scsi_scan_host(esp->host);