V4L/DVB (13798): [Mantis] Enable power for all cards, use byte mode only on relevant devices

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 20 insertions, 7 deletions

diff --git a/drivers/media/dvb/mantis/hopper_vp3028.c b/drivers/media/dvb/mantis/hopper_vp3028.c
index ba0c7e58b7a6..16b39d3b9ace 100644
--- a/drivers/media/dvb/mantis/hopper_vp3028.c
+++ b/drivers/media/dvb/mantis/hopper_vp3028.c
@@ -45,17 +45,30 @@ struct zl10353_config hopper_vp3028_config = {
 static int vp3028_frontend_init(struct mantis_pci *mantis, struct dvb_frontend *fe)
 {
         struct i2c_adapter *adapter     = &mantis->adapter;
+        struct mantis_hwconfig *config  = mantis->hwconfig;
         int err = 0;
 
+        gpio_set_bits(mantis, config->reset, 0);
+        msleep(100);
         err = mantis_frontend_power(mantis, POWER_ON);
-        mantis_frontend_soft_reset(mantis);
-
-        dprintk(MANTIS_ERROR, 1, "Probing for 10353 (DVB-T)");
-        fe = zl10353_attach(&hopper_vp3028_config, adapter);
-
-        if (!fe)
-                return -1;
+        msleep(100);
+        gpio_set_bits(mantis, config->reset, 1);
 
+        err = mantis_frontend_power(mantis, POWER_ON);
+        if (err == 0) {
+                msleep(250);
+                dprintk(MANTIS_ERROR, 1, "Probing for 10353 (DVB-T)");
+                fe = zl10353_attach(&hopper_vp3028_config, adapter);
+
+                if (!fe)
+                        return -1;
+        } else {
+                dprintk(MANTIS_ERROR, 1, "Frontend on <%s> POWER ON failed! <%d>",
+                        adapter->name,
+                        err);
+
+                return -EIO;
+        }
         dprintk(MANTIS_ERROR, 1, "Done!");
 
         return 0;