From 8aa108144220bb70f7aca79ec5a26de5f3715080 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bart.vanassche@sandisk.com>
Date: Thu, 11 Jun 2015 15:47:28 +0000
Subject: [PATCH] Merge r6014 from 3.0.x-iser branch

git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6258 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 iscsi-scst/kernel/isert-scst/iser_datamover.c | 7 +------
 iscsi-scst/kernel/isert-scst/isert_login.c    | 4 ++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/iscsi-scst/kernel/isert-scst/iser_datamover.c b/iscsi-scst/kernel/isert-scst/iser_datamover.c
index f46e7285e..5f69922b1 100644
--- a/iscsi-scst/kernel/isert-scst/iser_datamover.c
+++ b/iscsi-scst/kernel/isert-scst/iser_datamover.c
@@ -92,12 +92,7 @@ out:
 
 void *isert_portal_add(struct sockaddr *saddr, size_t addr_len)
 {
-	struct isert_portal *portal = isert_portal_start(saddr, addr_len);
-
-	if (IS_ERR(portal))
-		portal = NULL;
-
-	return portal;
+	return isert_portal_start(saddr, addr_len);
 }
 
 int isert_portal_remove(void *portal_h)
diff --git a/iscsi-scst/kernel/isert-scst/isert_login.c b/iscsi-scst/kernel/isert-scst/isert_login.c
index 09c338f86..b2e18eb7a 100644
--- a/iscsi-scst/kernel/isert-scst/isert_login.c
+++ b/iscsi-scst/kernel/isert-scst/isert_login.c
@@ -410,10 +410,10 @@ static long isert_listen_ioctl(struct file *filp, unsigned int cmd,
 
 		portal = isert_portal_add((struct sockaddr *)&dev->info.addr,
 					  dev->info.addr_len);
-		if (!portal) {
+		if (IS_ERR(portal)) {
 			PRINT_ERROR("Unable to add portal of size %zu\n",
 				    dev->info.addr_len);
-			res = -EINVAL;
+			res = PTR_ERR(portal);
 			goto out;
 		}
 		dev->portal_h[dev->free_portal_idx++] = portal;