lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (9006): S2API: Allow reliable use of old and new api on the same frontend, regardless.

Browse Source 
Signed-off-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Steven Toth
2008-09-13 15:09:07 -03:00
committed by Mauro Carvalho Chehab
parent e6f9ec8657
commit 4dd88bec36
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/dvb/dvb-core/dvb_frontend.c
View File

@@ -1299,8 +1299,10 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file,
if ((cmd == FE_SET_PROPERTY) || (cmd == FE_GET_PROPERTY)) if ((cmd == FE_SET_PROPERTY) || (cmd == FE_GET_PROPERTY))
err = dvb_frontend_ioctl_properties(inode, file, cmd, parg); 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); err = dvb_frontend_ioctl_legacy(inode, file, cmd, parg);
}
up(&fepriv->sem); up(&fepriv->sem);
return err; return err;
@@ -1567,8 +1569,6 @@ static int dvb_frontend_ioctl_legacy(struct inode *inode, struct file *file,
case FE_SET_FRONTEND: { case FE_SET_FRONTEND: {
struct dvb_frontend_tune_settings fetunesettings; struct dvb_frontend_tune_settings fetunesettings;
dtv_property_cache_sync(fe, &fepriv->parameters);
if(fe->dtv_property_cache.state == DTV_TUNE) { if(fe->dtv_property_cache.state == DTV_TUNE) {
if (dvb_frontend_check_parameters(fe, &fepriv->parameters) < 0) { if (dvb_frontend_check_parameters(fe, &fepriv->parameters) < 0) {
err = -EINVAL; err = -EINVAL;
@@ -1580,6 +1580,7 @@ static int dvb_frontend_ioctl_legacy(struct inode *inode, struct file *file,
break; break;
} }
dtv_property_cache_sync(fe, &fepriv->parameters);
memcpy (&fepriv->parameters, parg, memcpy (&fepriv->parameters, parg,
sizeof (struct dvb_frontend_parameters)); sizeof (struct dvb_frontend_parameters));
} }