diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index ff8cda0ac333..7fe9b3fb1e34 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -848,8 +848,7 @@ void dtv_property_dump(struct dtv_property *tvp)
 {
 	int i;
 
-	if( (tvp->cmd <= 0 || tvp->cmd > DTV_DELIVERY_SYSTEM) &&
-			tvp->cmd != DTV_API_VERSION) {
+	if (tvp->cmd <= 0 || tvp->cmd > DTV_MAX_COMMAND) {
 		printk("%s: tvp.cmd = 0x%08x (undefined/unknown/invalid)\n",
 			__func__, tvp->cmd);
 		return;
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index eb98f8c37cad..1cfcd1a86e8a 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -270,6 +270,8 @@ struct dvb_frontend_event {
 
 #define DTV_API_VERSION				35
 
+#define DTV_MAX_COMMAND				DTV_API_VERSION
+
 typedef enum fe_pilot {
 	PILOT_ON,
 	PILOT_OFF,