[media] [PATCH] don't reset the delivery system on DTV_CLEAR
authorMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 10 Jan 2012 21:00:50 +0000 (18:00 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 11 Jan 2012 01:44:07 +0000 (23:44 -0200)
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>
drivers/media/dvb/dvb-core/dvb_frontend.c

index a904793..b15db4f 100644 (file)
@@ -909,7 +909,6 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe)
 
        c->state = DTV_CLEAR;
 
-       c->delivery_system = fe->ops.delsys[0];
        dprintk("%s() Clearing cache for delivery system %d\n", __func__,
                c->delivery_system);
 
@@ -2377,6 +2376,8 @@ int dvb_register_frontend(struct dvb_adapter* dvb,
         * Initialize the cache to the proper values according with the
         * first supported delivery system (ops->delsys[0])
         */
+
+        fe->dtv_property_cache.delivery_system = fe->ops.delsys[0];
        dvb_frontend_clear_cache(fe);
 
        mutex_unlock(&frontend_mutex);