diff --git a/[refs] b/[refs]
index 3c09220fa8c1..160ac1f5a825 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1080bf80862c571b5f0a20cb601e24dd90e2026
+refs/heads/master: dea33496ddc2bf1a50e9def87b4ef14709d8cb6d
diff --git a/trunk/scripts/checkpatch.pl b/trunk/scripts/checkpatch.pl
index 457f87460d6e..5382f7287397 100755
--- a/trunk/scripts/checkpatch.pl
+++ b/trunk/scripts/checkpatch.pl
@@ -408,6 +408,7 @@ sub ctx_statement_block {
 		# context.
 		if ($off >= $len) {
 			for (; $remain > 0; $line++) {
+				last if (!defined $lines[$line]);
 				next if ($lines[$line] =~ /^-/);
 				$remain--;
 				$loff = $len;