aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Toth <stoth@linuxtv.org>2008-10-06 20:44:04 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-13 12:25:35 -0200
commit82d7669dc3c0e795c24111fed88e9d5d70f209e0 (patch)
tree89b01d5e4613699de62ed32744f0f78bce2c433f
parente5cefa82ce31b14574947e570d638a6d58225338 (diff)
V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation
This means that when developers add new commands then they'll be see the DTV_MAX_COMMAND define and will be more likely to modify it, without having to modify the command validation code. Signed-off-by: Steven Toth <stoth@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/dvb-core/dvb_frontend.c3
-rw-r--r--include/linux/dvb/frontend.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index ff8cda0ac33..7fe9b3fb1e3 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 eb98f8c37ca..1cfcd1a86e8 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,