mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 12:42:02 +00:00
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] esp: fix instance numbering.
This commit is contained in:
commit
544002ef83
@ -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);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user