diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-10 16:00:50 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-10 20:44:07 -0500 |
commit | 240ab508aa9fb7a294b0ecb563b19ead000b2463 (patch) | |
tree | cf521c7b5e5453c2fead757953d7777eb6508979 /drivers/media/dvb | |
parent | 9544e8a64795d75875ff4c680a43aa452a37b260 (diff) |
[media] [PATCH] don't reset the delivery system on DTV_CLEAR
As a DVBv3 application may be relying on the delivery system,
don't reset it at DTV_CLEAR. For DVBv5 applications, the
delivery system should be set anyway.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r-- | drivers/media/dvb/dvb-core/dvb_frontend.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index a904793e61e2..b15db4fe347b 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c | |||
@@ -909,7 +909,6 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe) | |||
909 | 909 | ||
910 | c->state = DTV_CLEAR; | 910 | c->state = DTV_CLEAR; |
911 | 911 | ||
912 | c->delivery_system = fe->ops.delsys[0]; | ||
913 | dprintk("%s() Clearing cache for delivery system %d\n", __func__, | 912 | dprintk("%s() Clearing cache for delivery system %d\n", __func__, |
914 | c->delivery_system); | 913 | c->delivery_system); |
915 | 914 | ||
@@ -2377,6 +2376,8 @@ int dvb_register_frontend(struct dvb_adapter* dvb, | |||
2377 | * Initialize the cache to the proper values according with the | 2376 | * Initialize the cache to the proper values according with the |
2378 | * first supported delivery system (ops->delsys[0]) | 2377 | * first supported delivery system (ops->delsys[0]) |
2379 | */ | 2378 | */ |
2379 | |||
2380 | fe->dtv_property_cache.delivery_system = fe->ops.delsys[0]; | ||
2380 | dvb_frontend_clear_cache(fe); | 2381 | dvb_frontend_clear_cache(fe); |
2381 | 2382 | ||
2382 | mutex_unlock(&frontend_mutex); | 2383 | mutex_unlock(&frontend_mutex); |