diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 09:08:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 09:08:04 -0700 |
| commit | 544002ef832730b18327000c898a140bfc93efd4 (patch) | |
| tree | caf5be1704615788d70e5d5999255d1040c34db4 /drivers | |
| parent | aa9d40de77f8ec734f48d0be0c7fe7732d505af4 (diff) | |
| parent | ff4abd6cfacf0bb23a077f615d3a5cd17359db1b (diff) | |
| download | blackbird-op-linux-544002ef832730b18327000c898a140bfc93efd4.tar.gz blackbird-op-linux-544002ef832730b18327000c898a140bfc93efd4.zip | |
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.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/esp_scsi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c index 77b06a983fa7..95cf7b6cd622 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); |
