[media] tm6000: add radio capabilities

add radio capabilities

Signed-off-by: Stefan Ringel <stefan.ringel@arcor.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c
index 6e51486dbe648914c57c41f1d4aef35bfc8df81b..31ccd2f67b3511aae2d6c299d2e3876d9bb4e81d 100644 (file)
--- a/drivers/staging/tm6000/tm6000-cards.c
+++ b/drivers/staging/tm6000/tm6000-cards.c
@@ -254,6 +254,7 @@ struct tm6000_board tm6000_boards[] = {
                        .has_zl10353    = 1,
                        .has_eeprom     = 1,
                        .has_remote     = 1,
+                       .has_radio      = 1.
                        .has_input_comp = 1,
                        .has_input_svid = 1,
                },
@@ -276,6 +277,7 @@ struct tm6000_board tm6000_boards[] = {
                        .has_zl10353    = 0,
                        .has_eeprom     = 1,
                        .has_remote     = 1,
+                       .has_radio      = 1,
                        .has_input_comp = 1,
                        .has_input_svid = 1,
                },
@@ -350,6 +352,7 @@ struct tm6000_board tm6000_boards[] = {
                        .has_zl10353    = 1,
                        .has_eeprom     = 1,
                        .has_remote     = 0,
+                       .has_radio      = 1,
                        .has_input_comp = 0,
                        .has_input_svid = 0,
                },
@@ -372,6 +375,7 @@ struct tm6000_board tm6000_boards[] = {
                        .has_zl10353    = 0,
                        .has_eeprom     = 1,
                        .has_remote     = 0,
+                       .has_radio      = 1,
                        .has_input_comp = 0,
                        .has_input_svid = 0,
                },

diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c
index f82edfaac522f9c9596d27f457aefb4cfe680fd0..a434a32454db1ec9beec1bf93dda7eeaea277da0 100644 (file)
--- a/drivers/staging/tm6000/tm6000-video.c
+++ b/drivers/staging/tm6000/tm6000-video.c
@@ -1730,24 +1730,26 @@ int tm6000_v4l2_register(struct tm6000_core *dev)
        printk(KERN_INFO "%s: registered device %s\n",
               dev->name, video_device_node_name(dev->vfd));
 
-       dev->radio_dev = vdev_init(dev, &tm6000_radio_template,
-                                                  "radio");
-       if (!dev->radio_dev) {
-               printk(KERN_INFO "%s: can't register radio device\n",
-                      dev->name);
-               return ret; /* FIXME release resource */
-       }
+       if (dev->caps.has_radio) {
+               dev->radio_dev = vdev_init(dev, &tm6000_radio_template,
+                                                          "radio");
+               if (!dev->radio_dev) {
+                       printk(KERN_INFO "%s: can't register radio device\n",
+                              dev->name);
+                       return ret; /* FIXME release resource */
+               }
 
-       ret = video_register_device(dev->radio_dev, VFL_TYPE_RADIO,
-                                   radio_nr);
-       if (ret < 0) {
-               printk(KERN_INFO "%s: can't register radio device\n",
-                      dev->name);
-               return ret; /* FIXME release resource */
-       }
+               ret = video_register_device(dev->radio_dev, VFL_TYPE_RADIO,
+                                           radio_nr);
+               if (ret < 0) {
+                       printk(KERN_INFO "%s: can't register radio device\n",
+                              dev->name);
+                       return ret; /* FIXME release resource */
+               }
 
-       printk(KERN_INFO "%s: registered device %s\n",
-              dev->name, video_device_node_name(dev->radio_dev));
+               printk(KERN_INFO "%s: registered device %s\n",
+                      dev->name, video_device_node_name(dev->radio_dev));
+       }
 
        printk(KERN_INFO "Trident TVMaster TM5600/TM6000/TM6010 USB2 board (Load status: %d)\n", ret);
        return ret;

diff --git a/drivers/staging/tm6000/tm6000.h b/drivers/staging/tm6000/tm6000.h
index fdd6d30fdb41b65f23c32983688393363f327660..8cdc992da5a590fa765aaa739de20c2d21ce2b4d 100644 (file)
--- a/drivers/staging/tm6000/tm6000.h
+++ b/drivers/staging/tm6000/tm6000.h
@@ -129,6 +129,7 @@ struct tm6000_capabilities {
        unsigned int    has_zl10353:1;
        unsigned int    has_eeprom:1;
        unsigned int    has_remote:1;
+       unsigned int    has_radio:1;
        unsigned int    has_input_comp:1;
        unsigned int    has_input_svid:1;
 };