]> err.no Git - linux-2.6/commitdiff
V4L/DVB (5158): Dvb-ttpci: Fixed unregistering the vbi device
authorOliver Endriss <o.endriss@gmx.de>
Sun, 28 Jan 2007 00:13:06 +0000 (21:13 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 21 Feb 2007 15:35:09 +0000 (13:35 -0200)
Fixed unregistering the vbi device for cards without analog tuner.
Thanks to Marco Schluessler <marco@lordzodiac.de> for pointing out this bug.

Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/dvb/ttpci/av7110.h
drivers/media/dvb/ttpci/av7110_v4l.c

index 9c79696da08a60d622aaf347cc5a67609fe74388..1d05166bd853d80c3e062061833d94e7ea5f810e 100644 (file)
@@ -35,7 +35,6 @@
 
 #define ANALOG_TUNER_VES1820 1
 #define ANALOG_TUNER_STV0297 2
-#define ANALOG_TUNER_VBI     0x100
 
 extern int av7110_debug;
 
index dbfd5e7b4be0c3ef40b79ec3a4b48a6c6a2855af..78a15d52b056fa03abdf0125c6f03c34711e162a 100644 (file)
@@ -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;
 }