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

Commit ecfcc83b authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7755): ivtv: add support for card comments and detected but unsupported cards 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent d86e2ee9

drivers/media/video/ivtv/ivtv-cards.c

+2 −0
Original line number Diff line number Diff line
@@ -875,6 +875,7 @@ static const struct ivtv_card_pci_info ivtv_pci_pg600v2[] = { 
static const struct ivtv_card ivtv_card_pg600v2 = {

	.type = IVTV_CARD_PG600V2,

	.name = "Yuan PG600-2, GotView PCI DVD Lite",

	.comment = "only Composite and S-Video inputs are supported, not the tuner\n",

	.v4l2_capabilities = IVTV_CAP_ENCODER,

	.hw_video = IVTV_HW_CX25840,

	.hw_audio = IVTV_HW_CX25840,
@@ -940,6 +941,7 @@ static const struct ivtv_card_pci_info ivtv_pci_avertv_mce116[] = { 
static const struct ivtv_card ivtv_card_avertv_mce116 = {

	.type = IVTV_CARD_AVERTV_MCE116,

	.name = "AVerTV MCE 116 Plus",

	.comment = "only Composite and S-Video inputs are supported, not the tuner\n",

	.v4l2_capabilities = IVTV_CAP_ENCODER,

	.hw_video = IVTV_HW_CX25840,

	.hw_audio = IVTV_HW_CX25840,

drivers/media/video/ivtv/ivtv-cards.h

+1 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ struct ivtv_card_tuner_i2c { 
struct ivtv_card {

	int type;

	char *name;

	char *comment;

	u32 v4l2_capabilities;

	u32 hw_video;		/* hardware used to process video */

	u32 hw_audio;		/* hardware used to process audio */

drivers/media/video/ivtv/ivtv-driver.c

+7 −0
Original line number Diff line number Diff line
@@ -1097,6 +1097,13 @@ static int __devinit ivtv_probe(struct pci_dev *dev, 
		   The PCI IDs are not always reliable. */

		ivtv_process_eeprom(itv);

	}

	if (itv->card->comment)

		IVTV_INFO("%s", itv->card->comment);

	if (itv->card->v4l2_capabilities == 0) {

		/* card was detected but is not supported */

		retval = -ENODEV;

		goto free_i2c;

	}



	if (itv->std == 0) {

		itv->std = V4L2_STD_NTSC_M;