diff --git a/[refs] b/[refs]
index 3e0f46ed635b..2bab92c67b83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 691d77b6b85c20e4166bafd12bd0131b28f95a16
+refs/heads/master: 721c1cb60e0546d2e71b9aa50426c94e69c6521a
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 826cdbac0114..7c17e95bf36f 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -1097,8 +1097,8 @@ sub process {
 					 $rawlines[$ln - 1] =~ /^-/);
 				$cnt--;
 				#print "RAW<$rawlines[$ln - 1]>\n";
-				($edge) = (defined $rawlines[$ln - 1] &&
-					$rawlines[$ln - 1] =~ m@(/\*|\*/)@);
+				last if (!defined $rawlines[$ln - 1]);
+				($edge) = ($rawlines[$ln - 1] =~ m@(/\*|\*/)@);
 				last if (defined $edge);
 			}
 			if (defined $edge && $edge eq '*/') {