diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-01-22 09:57:27 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-01-22 09:57:27 -0800 |
| commit | 4b1a9a5e40210cb4a0687806d3b631f7db4b9b0e (patch) | |
| tree | 4f33f3af2e1ff163c6f4a1022d1d6b6be7b11547 /drivers/scsi/be2iscsi | |
| parent | dcaf9aed995c2b2a49fb86bbbcfa2f92c797ab5d (diff) | |
| parent | 3ce438df106826edde7ad724f3819716a3f0cf56 (diff) | |
Merge branch 'misc' into for-linus
Diffstat (limited to 'drivers/scsi/be2iscsi')
| -rw-r--r-- | drivers/scsi/be2iscsi/be_iscsi.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/scsi/be2iscsi/be_iscsi.c b/drivers/scsi/be2iscsi/be_iscsi.c index ffadbee0b4d9..889066d9d6fb 100644 --- a/drivers/scsi/be2iscsi/be_iscsi.c +++ b/drivers/scsi/be2iscsi/be_iscsi.c @@ -541,10 +541,8 @@ static int be2iscsi_get_if_param(struct beiscsi_hba *phba, ip_type = BE2_IPV6; len = mgmt_get_if_info(phba, ip_type, &if_info); - if (len) { - kfree(if_info); + if (len) return len; - } switch (param) { case ISCSI_NET_PARAM_IPV4_ADDR: @@ -569,7 +567,7 @@ static int be2iscsi_get_if_param(struct beiscsi_hba *phba, break; case ISCSI_NET_PARAM_VLAN_ID: if (if_info->vlan_priority == BEISCSI_VLAN_DISABLE) - return -EINVAL; + len = -EINVAL; else len = sprintf(buf, "%d\n", (if_info->vlan_priority & @@ -577,7 +575,7 @@ static int be2iscsi_get_if_param(struct beiscsi_hba *phba, break; case ISCSI_NET_PARAM_VLAN_PRIORITY: if (if_info->vlan_priority == BEISCSI_VLAN_DISABLE) - return -EINVAL; + len = -EINVAL; else len = sprintf(buf, "%d\n", ((if_info->vlan_priority >> 13) & |