diff options
author | Rajmohan Mani <rajmohan.mani@intel.com> | 2018-10-05 12:22:17 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-10-08 11:50:40 -0400 |
commit | f9a0b14240a2d0bd196d35e8aac73df6eabd6382 (patch) | |
tree | 82f51a516ab8f89bfaf1c9e09b69b32668221e04 /drivers/media/i2c | |
parent | 557c97b5133669297be561e6091da9ab6e488e65 (diff) | |
download | linux-stable-f9a0b14240a2d0bd196d35e8aac73df6eabd6382.tar.gz linux-stable-f9a0b14240a2d0bd196d35e8aac73df6eabd6382.tar.bz2 linux-stable-f9a0b14240a2d0bd196d35e8aac73df6eabd6382.zip |
media: dw9714: Fix error handling in probe function
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>
Diffstat (limited to 'drivers/media/i2c')
-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; } |