V4L/DVB (5321): Saa7134-dvb: initialize the dvb frontend in dvb_init

The hardware is completely initialized afterwards, especially the
tda10046 has its firmware - which is also necessary in analog mode
of some hybrid boards.
Calling the sleep function afterwards saves power and definitely puts
hybrid boards into analog mode without additional code elsewere.

Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index bbb1a1e55af2e9131ef287ad41b3436566707182..6f98ec40553c8fa396939feeb8c5c833fbe34f25 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -937,6 +937,7 @@ static struct nxt200x_config kworldatsc110 = {
 static int dvb_init(struct saa7134_dev *dev)
 {
        char *board_name;
+       int ret;
        /* init struct videobuf_dvb */
        dev->ts.nr_bufs    = 32;
        dev->ts.nr_packets = 32*4;
@@ -1145,7 +1146,18 @@ static int dvb_init(struct saa7134_dev *dev)
        }
 
        /* register everything else */
-       return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev, &dev->pci->dev);
+       ret = videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev, &dev->pci->dev);
+
+       /* this sequence is necessary to make the tda1004x load its firmware
+        * and to enter analog mode of hybrid boards
+        */
+       if (!ret) {
+               if (dev->dvb.frontend->ops.init)
+                       dev->dvb.frontend->ops.init(dev->dvb.frontend);
+               if (dev->dvb.frontend->ops.sleep)
+                       dev->dvb.frontend->ops.sleep(dev->dvb.frontend);
+       }
+       return ret;
 }
 
 static int dvb_fini(struct saa7134_dev *dev)