diff options
| author | Andreas Oberritter <obi@linuxtv.org> | 2011-05-08 20:03:36 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-05-20 19:51:46 -0300 |
| commit | e23d9ae343f9d196382ab213612d76126f9c99af (patch) | |
| tree | 4186b95e86737506446ffd0e3efd18cca646208d /drivers/media | |
| parent | 15cc2bb385ced95be35d13895a67bfe52066778c (diff) | |
[media] DVB: call get_property at the end of dtv_property_process_get
- Drivers should be able to override properties returned to the user.
- The default values get prefilled from the cache.
Signed-off-by: Andreas Oberritter <obi@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/dvb/dvb-core/dvb_frontend.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index 67558bd26d89..fe6cd73620e6 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -1196,14 +1196,7 @@ static int dtv_property_process_get(struct dvb_frontend *fe, struct dtv_property *tvp, struct file *file) { - int r = 0; - - /* Allow the frontend to validate incoming properties */ - if (fe->ops.get_property) - r = fe->ops.get_property(fe, tvp); - - if (r < 0) - return r; + int r; switch(tvp->cmd) { case DTV_FREQUENCY: @@ -1323,6 +1316,13 @@ static int dtv_property_process_get(struct dvb_frontend *fe, return -EINVAL; } + /* Allow the frontend to override outgoing properties */ + if (fe->ops.get_property) { + r = fe->ops.get_property(fe, tvp); + if (r < 0) + return r; + } + dtv_property_dump(tvp); return 0; |