diff options
| author | Rajmohan Mani <rajmohan.mani@intel.com> | 2018-10-05 19:22:17 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-24 10:20:39 +0300 |
| commit | 96134bbea649a44f166c65f40ff155fff6abdf11 (patch) | |
| tree | d11d45938a0646fe974e19a5f7ef7cdcb0703fe4 /drivers/media | |
| parent | 2103ebde9ac0fd1ae9efd08784778340902e2a3b (diff) | |
| download | linux-96134bbea649a44f166c65f40ff155fff6abdf11.tar.xz | |
media: dw9714: Fix error handling in probe function
[ Upstream commit f9a0b14240a2d0bd196d35e8aac73df6eabd6382 ]
Fixed the case where v4l2_async_unregister_subdev()
is called unnecessarily in the error handling path
in probe function.
Signed-off-by: Rajmohan Mani <rajmohan.mani@intel.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/i2c/dw9714.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/i2c/dw9714.c b/drivers/media/i2c/dw9714.c index 91fae01d052b..3dc2100470a1 100644 --- a/drivers/media/i2c/dw9714.c +++ b/drivers/media/i2c/dw9714.c @@ -169,7 +169,8 @@ static int dw9714_probe(struct i2c_client *client) return 0; err_cleanup: - dw9714_subdev_cleanup(dw9714_dev); + v4l2_ctrl_handler_free(&dw9714_dev->ctrls_vcm); + media_entity_cleanup(&dw9714_dev->sd.entity); dev_err(&client->dev, "Probe failed: %d\n", rval); return rval; } |