From da8e869a10b3cece12c91f787199821b4e54aa87 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Fri, 25 Mar 2011 22:52:22 -0300
Subject: [PATCH] --- yaml --- r: 250199 b: refs/heads/master c:
 0cff593732fa5bdf07192be741a567b85a9c0cd3 h: refs/heads/master i:   250197:
 4a6bbeaac2bad0499453db64f219d10ce59ed1e2   250195:
 1ebcc2e20cc9183e42afdd5942b93aefee9f1152   250191:
 58f6d579e975275679e69a09acbf1a297ddad31d v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/pvrusb2/pvrusb2-std.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ad11392d6c16..c7c9f2272745 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce02704d48767bdd31eb0b804b1d45da5b683a8c
+refs/heads/master: 0cff593732fa5bdf07192be741a567b85a9c0cd3
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-std.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-std.c
index ca9f83a85ca5..35c8b4059827 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-std.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-std.c
@@ -370,7 +370,11 @@ struct v4l2_standard *pvr2_std_create_enum(unsigned int *countptr,
 
 	stddefs = kzalloc(sizeof(struct v4l2_standard) * std_cnt,
 			  GFP_KERNEL);
-	for (idx = 0; idx < std_cnt; idx++) stddefs[idx].index = idx;
+	if (!stddefs)
+		return NULL;
+
+	for (idx = 0; idx < std_cnt; idx++)
+		stddefs[idx].index = idx;
 
 	idx = 0;