diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-03 11:54:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-03 11:54:02 -0400 |
| commit | d8d088d25822b0199fdfb392085e1cf8a5914a97 (patch) | |
| tree | 06f73bec1e8db08d68641ea1c88740eeb0e3e7fc /drivers/scsi/scsi_scan.c | |
| parent | b05a720b374ac6af05b2fd4c70bb2c61a9f461ca (diff) | |
| parent | c92715b3c22e94105a8fd9e4a23047d05c5077e7 (diff) | |
Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index cca772624ae7..8d0d302844a1 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
| @@ -1197,6 +1197,7 @@ struct scsi_device *__scsi_add_device(struct Scsi_Host *shost, uint channel, | |||
| 1197 | if (!starget) | 1197 | if (!starget) |
| 1198 | return ERR_PTR(-ENOMEM); | 1198 | return ERR_PTR(-ENOMEM); |
| 1199 | 1199 | ||
| 1200 | get_device(&starget->dev); | ||
| 1200 | down(&shost->scan_mutex); | 1201 | down(&shost->scan_mutex); |
| 1201 | res = scsi_probe_and_add_lun(starget, lun, NULL, &sdev, 1, hostdata); | 1202 | res = scsi_probe_and_add_lun(starget, lun, NULL, &sdev, 1, hostdata); |
| 1202 | if (res != SCSI_SCAN_LUN_PRESENT) | 1203 | if (res != SCSI_SCAN_LUN_PRESENT) |