diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-07-03 11:04:27 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-07-03 11:04:27 -0700 |
| commit | 77ae174ddb84800611f5339a8bd53d49df6cd740 (patch) | |
| tree | 1d73287e061539846347bd679622116c80997d97 /drivers/scsi/be2iscsi/be_mgmt.c | |
| parent | 5616b0a46ed82eb9a093f752fc4d7bd3cc688583 (diff) | |
| parent | 8faeb529b2dabb9df691d614dda18910a43d05c9 (diff) | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus
Diffstat (limited to 'drivers/scsi/be2iscsi/be_mgmt.c')
| -rw-r--r-- | drivers/scsi/be2iscsi/be_mgmt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/be2iscsi/be_mgmt.c b/drivers/scsi/be2iscsi/be_mgmt.c index 6045aa78986..07934b0b9ee 100644 --- a/drivers/scsi/be2iscsi/be_mgmt.c +++ b/drivers/scsi/be2iscsi/be_mgmt.c @@ -1008,10 +1008,8 @@ int mgmt_set_ip(struct beiscsi_hba *phba, BE2_IPV6 : BE2_IPV4 ; rc = mgmt_get_if_info(phba, ip_type, &if_info); - if (rc) { - kfree(if_info); + if (rc) return rc; - } if (boot_proto == ISCSI_BOOTPROTO_DHCP) { if (if_info->dhcp_state) { |