diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-06-06 12:57:33 -0400 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-06-06 12:57:33 -0400 |
| commit | 0b68177ccd12866d9f19cafad212b861c9d02a8c (patch) | |
| tree | 6fc26aa59fb183fe9c86d44ae14ce423ad7211da /drivers/scsi/scsi_scan.c | |
| parent | d0d2f2df65ddea9a30ddd117f769bfff65d3fc56 (diff) | |
| parent | 7cef5677ef3a8084f2588ce0a129dc95d65161f6 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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) |