Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7857735b authored by Oliver Endriss's avatar Oliver Endriss Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (5158): Dvb-ttpci: Fixed unregistering the vbi device 



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: default avatarOliver Endriss <o.endriss@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 357a268d

drivers/media/dvb/ttpci/av7110.h

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 


#define ANALOG_TUNER_VES1820 1

#define ANALOG_TUNER_STV0297 2

#define ANALOG_TUNER_VBI     0x100



extern int av7110_debug;

drivers/media/dvb/ttpci/av7110_v4l.c

+2 −7
Original line number Diff line number Diff line
@@ -817,19 +817,14 @@ 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);

	return 0;

}