diff --git a/[refs] b/[refs]
index 1d9b725dcabd..3293493380d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01a8f038c07c4119029c63f1ed1c6ac986665d48
+refs/heads/master: 4aae8efb4908fa3f80dc1177d093443bc09adf5f
diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
index 4c3f0d7e355c..f44b64b8e614 100644
--- a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -848,6 +848,13 @@ void dtv_property_dump(struct dtv_property *tvp)
 {
 	int i;
 
+	if( (tvp->cmd <= 0 || tvp->cmd > DTV_DELIVERY_SYSTEM) &&
+			tvp->cmd != DTV_API_VERSION) {
+		printk("%s: tvp.cmd = 0x%08x (undefined/unknown/invalid)\n",
+			__func__, tvp->cmd);
+		return;
+	}
+
 	printk("%s() tvp.cmd    = 0x%08x (%s)\n"
 		,__FUNCTION__
 		,tvp->cmd