Skip to content

Commit

Permalink
[media] DVB: call get_property at the end of dtv_property_process_get
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
Andreas Oberritter authored and Mauro Carvalho Chehab committed May 20, 2011
1 parent 15cc2bb commit e23d9ae
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/media/dvb/dvb-core/dvb_frontend.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit e23d9ae

Please sign in to comment.