Skip to content

Commit

Permalink
V4L/DVB (9006): S2API: Allow reliable use of old and new api on the s…
Browse files Browse the repository at this point in the history
…ame frontend, regardless.

Signed-off-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Steven Toth authored and Mauro Carvalho Chehab committed Oct 12, 2008
1 parent e6f9ec8 commit 4dd88be
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/media/dvb/dvb-core/dvb_frontend.c
Original file line number Diff line number Diff line change
Expand Up @@ -1299,8 +1299,10 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,

if ((cmd == FE_SET_PROPERTY) || (cmd == FE_GET_PROPERTY))
err = dvb_frontend_ioctl_properties(inode, file, cmd, parg);
else
else {
fe->dtv_property_cache.state = DTV_UNDEFINED;
err = dvb_frontend_ioctl_legacy(inode, file, cmd, parg);
}

up(&fepriv->sem);
return err;
Expand Down Expand Up @@ -1567,8 +1569,6 @@ static int dvb_frontend_ioctl_legacy(struct inode *inode, struct file *file,
case FE_SET_FRONTEND: {
struct dvb_frontend_tune_settings fetunesettings;

dtv_property_cache_sync(fe, &fepriv->parameters);

if(fe->dtv_property_cache.state == DTV_TUNE) {
if (dvb_frontend_check_parameters(fe, &fepriv->parameters) < 0) {
err = -EINVAL;
Expand All @@ -1580,6 +1580,7 @@ static int dvb_frontend_ioctl_legacy(struct inode *inode, struct file *file,
break;
}

dtv_property_cache_sync(fe, &fepriv->parameters);
memcpy (&fepriv->parameters, parg,
sizeof (struct dvb_frontend_parameters));
}
Expand Down

0 comments on commit 4dd88be

Please sign in to comment.