lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus'

Browse Source 
Conflicts:

	drivers/scsi/ipr.c

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
James Bottomley
2007-02-10 13:45:43 -06:00
parent 98051995ab 66efc5a7e3
commit 81b7bbd193
2025 changed files with 128405 additions and 54039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/scsi_scan.c
View File

@@ -1453,6 +1453,12 @@ struct scsi_device *__scsi_add_device(struct Scsi_Host *shost, uint channel,
struct device *parent = &shost->shost_gendev;
struct scsi_target *starget;
if (strncmp(scsi_scan_type, "none", 4) == 0)
return ERR_PTR(-ENODEV);
if (!shost->async_scan)
scsi_complete_async_scans();
starget = scsi_alloc_target(parent, channel, id);
if (!starget)
return ERR_PTR(-ENOMEM);