summaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-12 20:02:18 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-12 20:02:18 -0700
commit35d91f75c2c9548e606e813413f03c5cc35da969 (patch)
tree2a1a3f32320409303247a72ead35107c271abb17 /drivers/ieee1394
parent9401c705f2a6a7e5df102f6443dba395c3c5e5a8 (diff)
parent70c83e110541e894fa16aee0f57bcf4207b33e7b (diff)
downloadblackbird-op-linux-35d91f75c2c9548e606e813413f03c5cc35da969.tar.gz
blackbird-op-linux-35d91f75c2c9548e606e813413f03c5cc35da969.zip
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.c8
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)
static int sbp2_start_device(struct scsi_id_instance_data *scsi_id)
{
struct sbp2scsi_host_info *hi = scsi_id->hi;
- struct scsi_device *sdev;
+ int error;
SBP2_DEBUG("sbp2_start_device");
@@ -939,10 +939,10 @@ alloc_fail:
sbp2_max_speed_and_size(scsi_id);
/* Add this device to the scsi layer now */
- sdev = scsi_add_device(scsi_id->scsi_host, 0, scsi_id->ud->id, 0);
- if (IS_ERR(sdev)) {
+ error = scsi_add_device(scsi_id->scsi_host, 0, scsi_id->ud->id, 0);
+ if (error) {
SBP2_ERR("scsi_add_device failed");
- return PTR_ERR(sdev);
+ return error;
}
return 0;
OpenPOWER on IntegriCloud