1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index fafe6407b3d0..238c77b52f89 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -112,6 +112,7 @@ static int SendDiSEqCMsg (struct budget *budget, int len, u8 *msg, unsigned long
  *   Routines for the Fujitsu Siemens Activy budget card
  *   22 kHz tone and DiSEqC are handled by the frontend.
  *   Voltage must be set here.
+ *   GPIO 1: LNBP EN, GPIO 2: LNBP VSEL
  */
 static int SetVoltage_Activy (struct budget *budget, fe_sec_voltage_t voltage)
 {
@@ -121,11 +122,16 @@ static int SetVoltage_Activy (struct budget *budget, fe_sec_voltage_t voltage)
 
         switch (voltage) {
                 case SEC_VOLTAGE_13:
+                        saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTHI);
                         saa7146_setgpio(dev, 2, SAA7146_GPIO_OUTLO);
                         break;
                 case SEC_VOLTAGE_18:
+                        saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTHI);
                         saa7146_setgpio(dev, 2, SAA7146_GPIO_OUTHI);
                         break;
+                case SEC_VOLTAGE_OFF:
+                        saa7146_setgpio(dev, 1, SAA7146_GPIO_OUTLO);
+                        break;
                 default:
                         return -EINVAL;
         }
@@ -206,7 +212,7 @@ static int lnbp21_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
         return 0;
 }
 
-static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend* fe, int arg)
+static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend* fe, long arg)
 {
         struct budget* budget = (struct budget*) fe->dvb->priv;
         u8 buf;
@@ -580,6 +586,7 @@ static void frontend_init(struct budget *budget)
                 if (budget->dvb_frontend) {
                         budget->dvb_frontend->ops->set_voltage = lnbp21_set_voltage;
                         budget->dvb_frontend->ops->enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;
+                        budget->dvb_frontend->ops->dishnetwork_send_legacy_command = NULL;
                         if (lnbp21_init(budget)) {
                                 printk("%s: No LNBP21 found!\n", __FUNCTION__);
                                 goto error_out;
@@ -624,7 +631,7 @@ static void frontend_init(struct budget *budget)
                 budget->dvb_frontend = stv0299_attach(&alps_bsru6_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
                         budget->dvb_frontend->ops->set_voltage = siemens_budget_set_voltage;
-                        break;
+                        budget->dvb_frontend->ops->dishnetwork_send_legacy_command = NULL;
                 }
                 break;
 
@@ -632,7 +639,7 @@ static void frontend_init(struct budget *budget)
                 budget->dvb_frontend = tda8083_attach(&grundig_29504_451_config, &budget->i2c_adap);
                 if (budget->dvb_frontend) {
                         budget->dvb_frontend->ops->set_voltage = siemens_budget_set_voltage;
-                        break;
+                        budget->dvb_frontend->ops->dishnetwork_send_legacy_command = NULL;
                 }
                 break;