2 files changed, 2 insertions, 8 deletions

diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index 9c79696da08a..1d05166bd853 100644
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -35,7 +35,6 @@
 
 #define ANALOG_TUNER_VES1820 1
 #define ANALOG_TUNER_STV0297 2
-#define ANALOG_TUNER_VBI     0x100
 
 extern int av7110_debug;
 
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index dbfd5e7b4be0..78a15d52b056 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -817,20 +817,15 @@ int av7110_init_v4l(struct av7110 *av7110)
                 saa7146_vv_release(dev);
                 return -ENODEV;
         }
-        if (saa7146_register_device(&av7110->vbi_dev, dev, "av7110", VFL_TYPE_VBI)) {
+        if (saa7146_register_device(&av7110->vbi_dev, dev, "av7110", VFL_TYPE_VBI))
                 ERR(("cannot register vbi v4l2 device. skipping.\n"));
-        } else {
-                if (av7110->analog_tuner_flags)
-                        av7110->analog_tuner_flags |= ANALOG_TUNER_VBI;
-        }
         return 0;
 }
 
 int av7110_exit_v4l(struct av7110 *av7110)
 {
         saa7146_unregister_device(&av7110->v4l_dev, av7110->dev);
-        if (av7110->analog_tuner_flags & ANALOG_TUNER_VBI)
-                saa7146_unregister_device(&av7110->vbi_dev, av7110->dev);
+        saa7146_unregister_device(&av7110->vbi_dev, av7110->dev);
         return 0;
 }