diff --git a/[refs] b/[refs]
index e1999ea6ef83..850dafd50fa7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eacbe7c51f0fe770252e03ef2433a1ed4c990a17
+refs/heads/master: 4588677121d894ec989e938129da4ae02d332b6c
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index c756b9845056..b999d4eaefff 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -189,6 +189,7 @@ static ssize_t show_enum(int id,struct class_device *class_dev,char *buf)
 	bcnt = 0;
 	for (val = 0; val < ecnt; val++) {
 		pvr2_ctrl_get_valname(cptr,val,buf+bcnt,PAGE_SIZE-bcnt,&ccnt);
+		if (!ccnt) continue;
 		bcnt += ccnt;
 		if (bcnt >= PAGE_SIZE) break;
 		buf[bcnt] = '\n';