mirror of
https://github.com/tbsdtv/media_build.git
synced 2025-07-23 04:13:02 +02:00
23 lines
972 B
Diff
23 lines
972 B
Diff
diff --git a/drivers/media/i2c/tda1997x.c b/drivers/media/i2c/tda1997x.c
|
|
index 89bb7e6dc7a4..8060437ba2df 100644
|
|
--- a/drivers/media/i2c/tda1997x.c
|
|
+++ b/drivers/media/i2c/tda1997x.c
|
|
@@ -2691,8 +2691,7 @@ static int tda1997x_probe(struct i2c_client *client,
|
|
}
|
|
|
|
ret = 0x34 + ((io_read(sd, REG_SLAVE_ADDR)>>4) & 0x03);
|
|
- state->client_cec = devm_i2c_new_dummy_device(&client->dev,
|
|
- client->adapter, ret);
|
|
+ state->client_cec = i2c_new_dummy_device(client->adapter, ret);
|
|
if (IS_ERR(state->client_cec)) {
|
|
ret = PTR_ERR(state->client_cec);
|
|
goto err_free_mutex;
|
|
@@ -2804,6 +2803,7 @@ static int tda1997x_remove(struct i2c_client *client)
|
|
media_entity_cleanup(&sd->entity);
|
|
v4l2_ctrl_handler_free(&state->hdl);
|
|
regulator_bulk_disable(TDA1997X_NUM_SUPPLIES, state->supplies);
|
|
+ i2c_unregister_device(state->client_cec);
|
|
cancel_delayed_work_sync(&state->delayed_work_enable_hpd);
|
|
mutex_destroy(&state->page_lock);
|
|
mutex_destroy(&state->lock);
|