diff options
| author | Oliver Endriss <o.endriss@gmx.de> | 2007-01-28 01:13:06 +0100 |
|---|---|---|
| committer | Oliver Endriss <o.endriss@gmx.de> | 2007-01-28 01:13:06 +0100 |
| commit | 8772195a9bcb958673b4770e8f26978663658f42 (patch) | |
| tree | 7af700b956ca3bd82284a06c62ea79cbad4b89b7 /linux/drivers | |
| parent | 28765436e28b9c83d4b3f34dbaaa88c96aa2b324 (diff) | |
| download | mediapointer-dvb-s2-8772195a9bcb958673b4770e8f26978663658f42.tar.gz mediapointer-dvb-s2-8772195a9bcb958673b4770e8f26978663658f42.tar.bz2 | |
dvb-ttpci: Fixed unregistering the vbi device
From: Oliver Endriss <o.endriss@gmx.de>
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>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.h | 1 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110_v4l.c | 9 |
2 files changed, 2 insertions, 8 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.h b/linux/drivers/media/dvb/ttpci/av7110.h index c1fe289d3..5fcdaa402 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.h +++ b/linux/drivers/media/dvb/ttpci/av7110.h @@ -39,7 +39,6 @@ #define ANALOG_TUNER_VES1820 1 #define ANALOG_TUNER_STV0297 2 -#define ANALOG_TUNER_VBI 0x100 extern int av7110_debug; diff --git a/linux/drivers/media/dvb/ttpci/av7110_v4l.c b/linux/drivers/media/dvb/ttpci/av7110_v4l.c index 10cfe3131..3c6f5fcdc 100644 --- a/linux/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/linux/drivers/media/dvb/ttpci/av7110_v4l.c @@ -818,20 +818,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; } |