[PATCH] dvb: usb: fix WideView USB ids (fb41f5a7) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/media/dvb/dvb-usb/Kconfig

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -109,9 +109,9 @@ config DVB_USB_NOVA_T_USB2
	Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.		Say Y here to support the Hauppauge WinTV-NOVA-T usb2 DVB-T USB2.0 receiver.

	config DVB_USB_DTT200U		config DVB_USB_DTT200U
	tristate "Yakumo/Hama/Typhoon/Yuan DVB-T USB2.0 support"		tristate "WideView/Yakumo/Hama/Typhoon/Yuan DVB-T USB2.0 support"
	depends on DVB_USB		depends on DVB_USB
	help		help
	Say Y here to support the Yakumo/Hama/Typhoon/Yuan DVB-T USB2.0 receiver.		Say Y here to support the WideView/Yakumo/Hama/Typhoon/Yuan DVB-T USB2.0 receiver.

	The receivers are also known as DTT200U (Yakumo) and UB300 (Yuan).		The receivers are also known as DTT200U (Yakumo) and UB300 (Yuan).

drivers/media/dvb/dvb-usb/dibusb-mb.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -96,8 +96,8 @@ static int dibusb_probe(struct usb_interface *intf,

	/* do not change the order of the ID table */		/* do not change the order of the ID table */
	static struct usb_device_id dibusb_dib3000mb_table [] = {		static struct usb_device_id dibusb_dib3000mb_table [] = {
	/* 00 */ { USB_DEVICE(USB_VID_AVERMEDIA_UNK, USB_PID_AVERMEDIA_DVBT_USB_COLD)},		/* 00 */ { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_AVERMEDIA_DVBT_USB_COLD)},
	/* 01 */ { USB_DEVICE(USB_VID_AVERMEDIA_UNK, USB_PID_AVERMEDIA_DVBT_USB_WARM)},		/* 01 */ { USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_AVERMEDIA_DVBT_USB_WARM)},
	/* 02 */ { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_DVBU2000_COLD) },		/* 02 */ { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_DVBU2000_COLD) },
	/* 03 */ { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_DVBU2000_WARM) },		/* 03 */ { USB_DEVICE(USB_VID_COMPRO, USB_PID_COMPRO_DVBU2000_WARM) },
	/* 04 */ { USB_DEVICE(USB_VID_COMPRO_UNK, USB_PID_COMPRO_DVBU2000_UNK_COLD) },		/* 04 */ { USB_DEVICE(USB_VID_COMPRO_UNK, USB_PID_COMPRO_DVBU2000_UNK_COLD) },

drivers/media/dvb/dvb-usb/dtt200u-fe.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	/* Frontend part of the Linux driver for the Yakumo/Hama/Typhoon DVB-T		/* Frontend part of the Linux driver for the WideView/ Yakumo/ Hama/
	* USB2.0 receiver.		* Typhoon/ Yuan DVB-T USB2.0 receiver.
	*		*
	* Copyright (C) 2005 Patrick Boettcher <patrick.boettcher@desy.de>		* Copyright (C) 2005 Patrick Boettcher <patrick.boettcher@desy.de>
	*		*

drivers/media/dvb/dvb-usb/dtt200u.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	/* DVB USB library compliant Linux driver for the Yakumo/Hama/Typhoon DVB-T		/* DVB USB library compliant Linux driver for the WideView/ Yakumo/ Hama/
	* USB2.0 receiver.		* Typhoon/ Yuan DVB-T USB2.0 receiver.
	*		*
	* Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)		* Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
	*		*
	@@ -89,8 +89,8 @@ static int dtt200u_usb_probe(struct usb_interface *intf,
	}		}

	static struct usb_device_id dtt200u_usb_table [] = {		static struct usb_device_id dtt200u_usb_table [] = {
	{ USB_DEVICE(USB_VID_AVERMEDIA_UNK, USB_PID_DTT200U_COLD) },		{ USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_DTT200U_COLD) },
	{ USB_DEVICE(USB_VID_AVERMEDIA_UNK, USB_PID_DTT200U_WARM) },		{ USB_DEVICE(USB_VID_WIDEVIEW, USB_PID_DTT200U_WARM) },
	{ 0 },		{ 0 },
	};		};
	MODULE_DEVICE_TABLE(usb, dtt200u_usb_table);		MODULE_DEVICE_TABLE(usb, dtt200u_usb_table);
	@@ -127,8 +127,8 @@ static struct dvb_usb_properties dtt200u_properties = {

	.num_device_descs = 1,		.num_device_descs = 1,
	.devices = {		.devices = {
	{ .name = "Yakumo/Hama/Typhoon DVB-T USB2.0)",		{ .name = "WideView/Yakumo/Hama/Typhoon DVB-T USB2.0)",
	.cold_ids = { &dtt200u_usb_table[0], &dtt200u_usb_table[2] },		.cold_ids = { &dtt200u_usb_table[0], NULL },
	.warm_ids = { &dtt200u_usb_table[1], NULL },		.warm_ids = { &dtt200u_usb_table[1], NULL },
	},		},
	{ 0 },		{ 0 },
	@@ -138,7 +138,7 @@ static struct dvb_usb_properties dtt200u_properties = {
	/* usb specific object needed to register this driver with the usb subsystem */		/* usb specific object needed to register this driver with the usb subsystem */
	static struct usb_driver dtt200u_usb_driver = {		static struct usb_driver dtt200u_usb_driver = {
	.owner = THIS_MODULE,		.owner = THIS_MODULE,
	.name = "Yakumo/Hama/Typhoon DVB-T USB2.0",		.name = "dtt200u",
	.probe = dtt200u_usb_probe,		.probe = dtt200u_usb_probe,
	.disconnect = dvb_usb_device_exit,		.disconnect = dvb_usb_device_exit,
	.id_table = dtt200u_usb_table,		.id_table = dtt200u_usb_table,
	@@ -166,6 +166,6 @@ module_init(dtt200u_usb_module_init);
	module_exit(dtt200u_usb_module_exit);		module_exit(dtt200u_usb_module_exit);

	MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");		MODULE_AUTHOR("Patrick Boettcher <patrick.boettcher@desy.de>");
	MODULE_DESCRIPTION("Driver for the Yakumo/Hama/Typhoon DVB-T USB2.0 device");		MODULE_DESCRIPTION("Driver for the WideView/Yakumo/Hama/Typhoon DVB-T USB2.0 device");
	MODULE_VERSION("1.0");		MODULE_VERSION("1.0");
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");

drivers/media/dvb/dvb-usb/dtt200u.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	/* Common header file of Linux driver for the Yakumo/Hama/Typhoon DVB-T		/* Common header file of Linux driver for the WideView/ Yakumo/ Hama/
	* USB2.0 receiver.		* Typhoon/ Yuan DVB-T USB2.0 receiver.
	*		*
	* Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)		* Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@desy.de)
	*		*