From aec1f0120344dd87d50cbe71f3720e6866f09f2f Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 6 Oct 2008 20:44:04 -0300 Subject: [PATCH] --- yaml --- r: 114095 b: refs/heads/master c: 82d7669dc3c0e795c24111fed88e9d5d70f209e0 h: refs/heads/master i: 114093: fd066b7d147a1910898d0d5522cb49a19b44bddd 114091: 63a0f3244ef28e3d86fa623d2b0c600f0eca7da2 114087: cf9757305a4e063f26ad7de446e4acbf67b2108a 114079: 0975d6d590b954eaad31fde838b3a353f765a275 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-core/dvb_frontend.c | 3 +-- trunk/include/linux/dvb/frontend.h | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9f2fefb3350f..1945f711ebe8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e5cefa82ce31b14574947e570d638a6d58225338 +refs/heads/master: 82d7669dc3c0e795c24111fed88e9d5d70f209e0 diff --git a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c b/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c index ff8cda0ac333..7fe9b3fb1e34 100644 --- a/trunk/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/trunk/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/trunk/include/linux/dvb/frontend.h b/trunk/include/linux/dvb/frontend.h index eb98f8c37cad..1cfcd1a86e8a 100644 --- a/trunk/include/linux/dvb/frontend.h +++ b/trunk/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,