|
@@ -224,26 +224,8 @@ static struct dvb_usb_device_properties vp7045_properties;
|
|
|
static int vp7045_usb_probe(struct usb_interface *intf,
|
|
|
const struct usb_device_id *id)
|
|
|
{
|
|
|
- struct dvb_usb_device *d;
|
|
|
- int ret = dvb_usb_device_init(intf, &vp7045_properties,
|
|
|
- THIS_MODULE, &d, adapter_nr);
|
|
|
- if (ret)
|
|
|
- return ret;
|
|
|
-
|
|
|
- d->priv = kmalloc(20, GFP_KERNEL);
|
|
|
- if (!d->priv) {
|
|
|
- dvb_usb_device_exit(intf);
|
|
|
- return -ENOMEM;
|
|
|
- }
|
|
|
-
|
|
|
- return ret;
|
|
|
-}
|
|
|
-
|
|
|
-static void vp7045_usb_disconnect(struct usb_interface *intf)
|
|
|
-{
|
|
|
- struct dvb_usb_device *d = usb_get_intfdata(intf);
|
|
|
- kfree(d->priv);
|
|
|
- dvb_usb_device_exit(intf);
|
|
|
+ return dvb_usb_device_init(intf, &vp7045_properties,
|
|
|
+ THIS_MODULE, NULL, adapter_nr);
|
|
|
}
|
|
|
|
|
|
static struct usb_device_id vp7045_usb_table [] = {
|
|
@@ -258,7 +240,7 @@ MODULE_DEVICE_TABLE(usb, vp7045_usb_table);
|
|
|
static struct dvb_usb_device_properties vp7045_properties = {
|
|
|
.usb_ctrl = CYPRESS_FX2,
|
|
|
.firmware = "dvb-usb-vp7045-01.fw",
|
|
|
- .size_of_priv = sizeof(u8 *),
|
|
|
+ .size_of_priv = 20,
|
|
|
|
|
|
.num_adapters = 1,
|
|
|
.adapter = {
|
|
@@ -305,7 +287,7 @@ static struct dvb_usb_device_properties vp7045_properties = {
|
|
|
static struct usb_driver vp7045_usb_driver = {
|
|
|
.name = "dvb_usb_vp7045",
|
|
|
.probe = vp7045_usb_probe,
|
|
|
- .disconnect = vp7045_usb_disconnect,
|
|
|
+ .disconnect = dvb_usb_device_exit,
|
|
|
.id_table = vp7045_usb_table,
|
|
|
};
|
|
|
|