Kernel oops with Avermedia Volar DVB-T USB Dongle with >= 2.6.23

Commit Message

Nicolas Boichat May 23, 2010, 11:08 p.m. UTC

None

Patch

diff --git a/drivers/media/dvb/dib0700_devices.c b/drivers/media/dvb/dib0700_devices.c
index 34eab05..5c9cef7 100644
--- a/drivers/media/dvb/dib0700_devices.c
+++ b/drivers/media/dvb/dib0700_devices.c
@@ -2105,7 +2105,7 @@  struct dvb_usb_device_properties dib0700_devices[] = {
  				{ NULL },
  			},
  			{   "AVerMedia AVerTV DVB-T Volar",
-				{&dib0700_usb_id_table[5],&dib0700_usb_id_table[10] },
+				{&dib0700_usb_id_table[5] },
  				{ NULL },
  			},
  			{   "Compro Videomate U500",
@@ -2136,6 +2136,30 @@  struct dvb_usb_device_properties dib0700_devices[] = {
  		.rc_query         = dib0700_rc_query
  	}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,

+		.num_adapters = 1,
+		.adapter = {
+			{
+				.frontend_attach  = stk7700p_frontend_attach,
+				.tuner_attach     = stk7700p_tuner_attach,
+
+				DIB0700_DEFAULT_STREAMING_CONFIG(0x02),
+			},
+		},
+
+		.num_device_descs = 1,
+		.devices = {
+			{   "AVerMedia AVerTV DVB-T Volar (B808)",
+				{&dib0700_usb_id_table[10] },
+				{ NULL },
+			}
+		},
+
+		.rc_interval      = DEFAULT_RC_INTERVAL,
+		.rc_key_map       = dib0700_rc_keys,
+		.rc_key_map_size  = ARRAY_SIZE(dib0700_rc_keys),
+		.rc_query         = dib0700_rc_query
+	}, { DIB0700_DEFAULT_DEVICE_PROPERTIES,
+
  		.num_adapters = 2,
  		.adapter = {
  			{