2 files changed, 7 insertions, 6 deletions

diff --git a/drivers/media/common/tuners/tda827x.c b/drivers/media/common/tuners/tda827x.c
index e180def0a657..a0d176267470 100644
--- a/drivers/media/common/tuners/tda827x.c
+++ b/drivers/media/common/tuners/tda827x.c
@@ -540,9 +540,14 @@ static int tda827xa_set_params(struct dvb_frontend *fe)
         }
         tuner_freq = c->frequency;
 
-        if (fe->ops.info.type == FE_QAM) {
+        switch (c->delivery_system) {
+        case SYS_DVBC_ANNEX_A:
+        case SYS_DVBC_ANNEX_C:
                 dprintk("%s select tda827xa_dvbc\n", __func__);
                 frequency_map = tda827xa_dvbc;
+                break;
+        default:
+                break;
         }
 
         i = 0;
diff --git a/drivers/media/dvb/firewire/firedtv-fe.c b/drivers/media/dvb/firewire/firedtv-fe.c
index 39f5caafd2be..6fe9793b98b3 100644
--- a/drivers/media/dvb/firewire/firedtv-fe.c
+++ b/drivers/media/dvb/firewire/firedtv-fe.c
@@ -173,7 +173,6 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
         switch (fdtv->type) {
         case FIREDTV_DVB_S:
                 ops->delsys[0]          = SYS_DVBS;
-                fi->type                = FE_QPSK;
 
                 fi->frequency_min       = 950000;
                 fi->frequency_max       = 2150000;
@@ -193,8 +192,7 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
 
         case FIREDTV_DVB_S2:
                 ops->delsys[0]          = SYS_DVBS;
-                ops->delsys[1]          = SYS_DVBS;
-                fi->type                = FE_QPSK;
+                ops->delsys[1]          = SYS_DVBS2;
 
                 fi->frequency_min       = 950000;
                 fi->frequency_max       = 2150000;
@@ -215,7 +213,6 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
 
         case FIREDTV_DVB_C:
                 ops->delsys[0]          = SYS_DVBC_ANNEX_A;
-                fi->type                = FE_QAM;
 
                 fi->frequency_min       = 47000000;
                 fi->frequency_max       = 866000000;
@@ -234,7 +231,6 @@ void fdtv_frontend_init(struct firedtv *fdtv, const char *name)
 
         case FIREDTV_DVB_T:
                 ops->delsys[0]          = SYS_DVBT;
-                fi->type                = FE_OFDM;
 
                 fi->frequency_min       = 49000000;
                 fi->frequency_max       = 861000000;