|
@@ -2101,14 +2101,12 @@ static struct dvb_usb_device_properties s6x0_properties = {
|
|
|
}
|
|
|
};
|
|
|
|
|
|
-static struct dvb_usb_device_properties *p1100;
|
|
|
static const struct dvb_usb_device_description d1100 = {
|
|
|
"Prof 1100 USB ",
|
|
|
{&dw2102_table[PROF_1100], NULL},
|
|
|
{NULL},
|
|
|
};
|
|
|
|
|
|
-static struct dvb_usb_device_properties *s660;
|
|
|
static const struct dvb_usb_device_description d660 = {
|
|
|
"TeVii S660 USB",
|
|
|
{&dw2102_table[TEVII_S660], NULL},
|
|
@@ -2127,14 +2125,12 @@ static const struct dvb_usb_device_description d480_2 = {
|
|
|
{NULL},
|
|
|
};
|
|
|
|
|
|
-static struct dvb_usb_device_properties *p7500;
|
|
|
static const struct dvb_usb_device_description d7500 = {
|
|
|
"Prof 7500 USB DVB-S2",
|
|
|
{&dw2102_table[PROF_7500], NULL},
|
|
|
{NULL},
|
|
|
};
|
|
|
|
|
|
-static struct dvb_usb_device_properties *s421;
|
|
|
static const struct dvb_usb_device_description d421 = {
|
|
|
"TeVii S421 PCI",
|
|
|
{&dw2102_table[TEVII_S421], NULL},
|
|
@@ -2334,6 +2330,11 @@ static int dw2102_probe(struct usb_interface *intf,
|
|
|
const struct usb_device_id *id)
|
|
|
{
|
|
|
int retval = -ENOMEM;
|
|
|
+ struct dvb_usb_device_properties *p1100;
|
|
|
+ struct dvb_usb_device_properties *s660;
|
|
|
+ struct dvb_usb_device_properties *p7500;
|
|
|
+ struct dvb_usb_device_properties *s421;
|
|
|
+
|
|
|
p1100 = kmemdup(&s6x0_properties,
|
|
|
sizeof(struct dvb_usb_device_properties), GFP_KERNEL);
|
|
|
if (!p1100)
|
|
@@ -2402,8 +2403,16 @@ static int dw2102_probe(struct usb_interface *intf,
|
|
|
0 == dvb_usb_device_init(intf, &t220_properties,
|
|
|
THIS_MODULE, NULL, adapter_nr) ||
|
|
|
0 == dvb_usb_device_init(intf, &tt_s2_4600_properties,
|
|
|
- THIS_MODULE, NULL, adapter_nr))
|
|
|
+ THIS_MODULE, NULL, adapter_nr)) {
|
|
|
+
|
|
|
+ /* clean up copied properties */
|
|
|
+ kfree(s421);
|
|
|
+ kfree(p7500);
|
|
|
+ kfree(s660);
|
|
|
+ kfree(p1100);
|
|
|
+
|
|
|
return 0;
|
|
|
+ }
|
|
|
|
|
|
retval = -ENODEV;
|
|
|
kfree(s421);
|