diff options
| author | Greg Kroah-Hartman | 2012-03-09 21:35:53 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-03-09 21:35:53 +0100 |
| commit | 263a5c8e16c34199ddf6de3f102e789ffa3ee26e (patch) | |
| tree | 4f049e339d522b2ab0ba3bed3ec217e4bbc83d35 /drivers/target/target_core_fabric_configfs.c | |
| parent | Revert "sysfs: Kill nlink counting." (diff) | |
| parent | Linux 3.3-rc6 (diff) | |
| download | kernel-qcow2-linux-263a5c8e16c34199ddf6de3f102e789ffa3ee26e.tar.gz kernel-qcow2-linux-263a5c8e16c34199ddf6de3f102e789ffa3ee26e.tar.xz kernel-qcow2-linux-263a5c8e16c34199ddf6de3f102e789ffa3ee26e.zip | |
Merge 3.3-rc6 into driver-core-next
This was done to resolve a conflict in the drivers/base/cpu.c file.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/target/target_core_fabric_configfs.c')
| -rw-r--r-- | drivers/target/target_core_fabric_configfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c index 4f77cce22646..9a2ce11e1a6e 100644 --- a/drivers/target/target_core_fabric_configfs.c +++ b/drivers/target/target_core_fabric_configfs.c @@ -766,9 +766,9 @@ static int target_fabric_port_link( lun_p = core_dev_add_lun(se_tpg, dev->se_hba, dev, lun->unpacked_lun); - if (IS_ERR(lun_p) || !lun_p) { + if (IS_ERR(lun_p)) { pr_err("core_dev_add_lun() failed\n"); - ret = -EINVAL; + ret = PTR_ERR(lun_p); goto out; } |