diff --git a/[refs] b/[refs]
index c7c9f2272745..5c577d622c34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cff593732fa5bdf07192be741a567b85a9c0cd3
+refs/heads/master: 92f6ed71cafae8580bd481db66edb81c3d9d958c
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-std.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-std.c
index 35c8b4059827..453627b07833 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-std.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-std.c
@@ -278,12 +278,10 @@ static struct v4l2_standard generic_standards[] = {
 	}
 };
 
-#define generic_standards_cnt ARRAY_SIZE(generic_standards)
-
 static struct v4l2_standard *match_std(v4l2_std_id id)
 {
 	unsigned int idx;
-	for (idx = 0; idx < generic_standards_cnt; idx++) {
+	for (idx = 0; idx < ARRAY_SIZE(generic_standards); idx++) {
 		if (generic_standards[idx].id & id) {
 			return generic_standards + idx;
 		}