diff --git a/[refs] b/[refs]
index b38a2c2cec2f..08b8301857ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c22c4a20a6ac7b10e43eab6963f941795c5e92aa
+refs/heads/master: 6afd2aa856eba0706176cecea1f989b1081c96dc
diff --git a/trunk/drivers/media/video/gspca/vc032x.c b/trunk/drivers/media/video/gspca/vc032x.c
index 26675236fbd2..c090efcd8045 100644
--- a/trunk/drivers/media/video/gspca/vc032x.c
+++ b/trunk/drivers/media/video/gspca/vc032x.c
@@ -3095,6 +3095,8 @@ static int sd_querymenu(struct gspca_dev *gspca_dev,
 
 	switch (menu->id) {
 	case V4L2_CID_POWER_LINE_FREQUENCY:
+		if (menu->index >= ARRAY_SIZE(freq_nm))
+			break;
 		strcpy((char *) menu->name, freq_nm[menu->index]);
 		return 0;
 	}