From 91da4c555d24276993a79cff0623e63956514ae2 Mon Sep 17 00:00:00 2001
From: Andy Grover <agrover@redhat.com>
Date: Thu, 9 Feb 2012 12:18:06 -0800
Subject: [PATCH] --- yaml --- r: 292830 b: refs/heads/master c:
 a1edf9cf6d1efed2981fcf6e4caa704fbb1bd093 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/target/target_core_transport.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 87cd3c63222a..7e568b1b92f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 16786454acec0e0e55e32d508b3058b32c1f23f3
+refs/heads/master: a1edf9cf6d1efed2981fcf6e4caa704fbb1bd093
diff --git a/trunk/drivers/target/target_core_transport.c b/trunk/drivers/target/target_core_transport.c
index 42da7a300729..1520dd2dd718 100644
--- a/trunk/drivers/target/target_core_transport.c
+++ b/trunk/drivers/target/target_core_transport.c
@@ -3546,10 +3546,12 @@ EXPORT_SYMBOL(transport_kmap_data_sg);
 
 void transport_kunmap_data_sg(struct se_cmd *cmd)
 {
-	if (!cmd->t_data_nents)
+	if (!cmd->t_data_nents) {
 		return;
-	else if (cmd->t_data_nents == 1)
+	} else if (cmd->t_data_nents == 1) {
 		kunmap(sg_page(cmd->t_data_sg));
+		return;
+	}
 
 	vunmap(cmd->t_data_vmap);
 	cmd->t_data_vmap = NULL;