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

Commit 1e13c8f0 authored by Patrick Boettcher's avatar Patrick Boettcher Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (13050): DIB0700: fix-up USB device ID for Terratec/Leadtek 



git commit db48138f changed by accident the
assignment of certain USB IDs to their device-specific-handlers.

Thanks to Edward Sheldrake for finding this regression

Signed-off-by: default avatarPatrick Boettcher <pboettcher@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2b5d9946

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

+6 −9
Original line number Diff line number Diff line
@@ -1925,7 +1925,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { 
				{ NULL },

			},

			{   "Leadtek Winfast DTV Dongle (STK7700P based)",

				{ &dib0700_usb_id_table[8] },

				{ &dib0700_usb_id_table[8], &dib0700_usb_id_table[34] },

				{ NULL },

			},

			{   "AVerMedia AVerTV DVB-T Express",
@@ -2064,7 +2064,7 @@ struct dvb_usb_device_properties dib0700_devices[] = { 
			},

		},



		.num_device_descs = 12,

		.num_device_descs = 11,

		.devices = {

			{   "DiBcom STK7070P reference design",

				{ &dib0700_usb_id_table[15], NULL },
@@ -2098,11 +2098,6 @@ struct dvb_usb_device_properties dib0700_devices[] = { 
				{ &dib0700_usb_id_table[30], NULL },

				{ NULL },

			},

			{   "Terratec Cinergy T USB XXS/ T3",

				{ &dib0700_usb_id_table[33],

					&dib0700_usb_id_table[52], NULL },

				{ NULL },

			},

			{   "Elgato EyeTV DTT",

				{ &dib0700_usb_id_table[49], NULL },

				{ NULL },
@@ -2343,8 +2338,10 @@ struct dvb_usb_device_properties dib0700_devices[] = { 
				{ &dib0700_usb_id_table[59], NULL },

				{ NULL },

			},

			{   "Terratec Cinergy T USB XXS (HD)",

				{ &dib0700_usb_id_table[34], &dib0700_usb_id_table[60] },

			{   "Terratec Cinergy T USB XXS (HD)/ T3",

				{ &dib0700_usb_id_table[33],

					&dib0700_usb_id_table[52],

					&dib0700_usb_id_table[60], NULL},

				{ NULL },

			},

		},