mirror of
https://github.com/tbsdtv/linux_media.git
synced 2025-07-23 12:43:29 +02:00
media: dvb-usb/tbs5930: Implemented tbs5930_disconnect() - unregister tuner/demod i2c_client.
This commit is contained in:
@@ -20,6 +20,7 @@
|
|||||||
#define TBS5930_VOLTAGE_CTRL (0x1800)
|
#define TBS5930_VOLTAGE_CTRL (0x1800)
|
||||||
|
|
||||||
struct tbs5930_state {
|
struct tbs5930_state {
|
||||||
|
struct i2c_client *i2c_client;
|
||||||
u8 initialized;
|
u8 initialized;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -147,6 +148,7 @@ static struct dvb_usb_device_properties tbs5930_properties;
|
|||||||
static int tbs5930_frontend_attach(struct dvb_usb_adapter *adap)
|
static int tbs5930_frontend_attach(struct dvb_usb_adapter *adap)
|
||||||
{
|
{
|
||||||
struct dvb_usb_device *d = adap->dev;
|
struct dvb_usb_device *d = adap->dev;
|
||||||
|
struct tbs5930_state *st = d->priv;
|
||||||
struct i2c_client *client;
|
struct i2c_client *client;
|
||||||
struct i2c_board_info info;
|
struct i2c_board_info info;
|
||||||
struct m88rs6060_cfg m88rs6060_config;
|
struct m88rs6060_cfg m88rs6060_config;
|
||||||
@@ -178,8 +180,8 @@ static int tbs5930_frontend_attach(struct dvb_usb_adapter *adap)
|
|||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
st->i2c_client = client;
|
||||||
|
|
||||||
|
|
||||||
buf[0] = 0;
|
buf[0] = 0;
|
||||||
buf[1] = 0;
|
buf[1] = 0;
|
||||||
tbs5930_op_rw(d->udev, 0xb7, 0, 0,
|
tbs5930_op_rw(d->udev, 0xb7, 0, 0,
|
||||||
@@ -190,7 +192,7 @@ static int tbs5930_frontend_attach(struct dvb_usb_adapter *adap)
|
|||||||
buf, 2, TBS5930_WRITE_MSG);
|
buf, 2, TBS5930_WRITE_MSG);
|
||||||
msleep(10);
|
msleep(10);
|
||||||
|
|
||||||
strscpy(adap->fe_adap->fe->ops.info.name,d->props.devices[0].name,52);
|
strscpy(adap->fe_adap[0].fe->ops.info.name,d->props.devices[0].name,52);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -315,11 +317,27 @@ static int tbs5930_probe(struct usb_interface *intf,
|
|||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void tbs5930_disconnect(struct usb_interface *intf)
|
||||||
|
{
|
||||||
|
#if 1
|
||||||
|
struct dvb_usb_device *d = usb_get_intfdata(intf);
|
||||||
|
struct tbs5930_state *st = d->priv;
|
||||||
|
struct i2c_client *client;
|
||||||
|
|
||||||
|
/* remove I2C client for tuner/demod*/
|
||||||
|
client = st->i2c_client;
|
||||||
|
if (client) {
|
||||||
|
module_put(client->dev.driver->owner);
|
||||||
|
i2c_unregister_device(client);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
dvb_usb_device_exit(intf);
|
||||||
|
}
|
||||||
|
|
||||||
static struct usb_driver tbs5930_driver = {
|
static struct usb_driver tbs5930_driver = {
|
||||||
.name = "tbs5930",
|
.name = "tbs5930",
|
||||||
.probe = tbs5930_probe,
|
.probe = tbs5930_probe,
|
||||||
.disconnect = dvb_usb_device_exit,
|
.disconnect = tbs5930_disconnect,
|
||||||
.id_table = tbs5930_table,
|
.id_table = tbs5930_table,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user