diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 23:02:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 23:02:18 -0400 |
| commit | 35d91f75c2c9548e606e813413f03c5cc35da969 (patch) | |
| tree | 2a1a3f32320409303247a72ead35107c271abb17 /drivers/ieee1394 | |
| parent | 9401c705f2a6a7e5df102f6443dba395c3c5e5a8 (diff) | |
| parent | 70c83e110541e894fa16aee0f57bcf4207b33e7b (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/sbp2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 627af507643a..de88218ef7cc 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
| @@ -790,7 +790,7 @@ static void sbp2_host_reset(struct hpsb_host *host) | |||
| 790 | static int sbp2_start_device(struct scsi_id_instance_data *scsi_id) | 790 | static int sbp2_start_device(struct scsi_id_instance_data *scsi_id) |
| 791 | { | 791 | { |
| 792 | struct sbp2scsi_host_info *hi = scsi_id->hi; | 792 | struct sbp2scsi_host_info *hi = scsi_id->hi; |
| 793 | struct scsi_device *sdev; | 793 | int error; |
| 794 | 794 | ||
| 795 | SBP2_DEBUG("sbp2_start_device"); | 795 | SBP2_DEBUG("sbp2_start_device"); |
| 796 | 796 | ||
| @@ -939,10 +939,10 @@ alloc_fail: | |||
| 939 | sbp2_max_speed_and_size(scsi_id); | 939 | sbp2_max_speed_and_size(scsi_id); |
| 940 | 940 | ||
| 941 | /* Add this device to the scsi layer now */ | 941 | /* Add this device to the scsi layer now */ |
| 942 | sdev = scsi_add_device(scsi_id->scsi_host, 0, scsi_id->ud->id, 0); | 942 | error = scsi_add_device(scsi_id->scsi_host, 0, scsi_id->ud->id, 0); |
| 943 | if (IS_ERR(sdev)) { | 943 | if (error) { |
| 944 | SBP2_ERR("scsi_add_device failed"); | 944 | SBP2_ERR("scsi_add_device failed"); |
| 945 | return PTR_ERR(sdev); | 945 | return error; |
| 946 | } | 946 | } |
| 947 | 947 | ||
| 948 | return 0; | 948 | return 0; |