diff options
author | Steven Toth <stoth@linuxtv.org> | 2008-10-06 19:44:04 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-13 10:25:35 -0400 |
commit | 82d7669dc3c0e795c24111fed88e9d5d70f209e0 (patch) | |
tree | 89b01d5e4613699de62ed32744f0f78bce2c433f | |
parent | e5cefa82ce31b14574947e570d638a6d58225338 (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.c | 3 | ||||
-rw-r--r-- | include/linux/dvb/frontend.h | 2 |
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 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) | |||
848 | { | 848 | { |
849 | int i; | 849 | int i; |
850 | 850 | ||
851 | if( (tvp->cmd <= 0 || tvp->cmd > DTV_DELIVERY_SYSTEM) && | 851 | if (tvp->cmd <= 0 || tvp->cmd > DTV_MAX_COMMAND) { |
852 | tvp->cmd != DTV_API_VERSION) { | ||
853 | printk("%s: tvp.cmd = 0x%08x (undefined/unknown/invalid)\n", | 852 | printk("%s: tvp.cmd = 0x%08x (undefined/unknown/invalid)\n", |
854 | __func__, tvp->cmd); | 853 | __func__, tvp->cmd); |
855 | return; | 854 | 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 { | |||
270 | 270 | ||
271 | #define DTV_API_VERSION 35 | 271 | #define DTV_API_VERSION 35 |
272 | 272 | ||
273 | #define DTV_MAX_COMMAND DTV_API_VERSION | ||
274 | |||
273 | typedef enum fe_pilot { | 275 | typedef enum fe_pilot { |
274 | PILOT_ON, | 276 | PILOT_ON, |
275 | PILOT_OFF, | 277 | PILOT_OFF, |