Commit b7a41762 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Mauro Carvalho Chehab

media: ov2680: don't register the v4l2 subdevice before checking chip ID

The driver registers the v4l2 subdevice before attempting to power on the
chip and checking its ID. This means that a media device driver that it's
waiting for this subdevice to be bound, will prematurely expose its media
device node to userspace because if something goes wrong the media entity
will be cleaned up again on the ov2680 probe function.

This also simplifies the probe function error path since no initialization
is made before attempting to enable the resources or checking the chip ID.

Fixes: 3ee47cad ("media: ov2680: Add Omnivision OV2680 sensor driver")
Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 75b090a5
...@@ -1088,26 +1088,20 @@ static int ov2680_probe(struct i2c_client *client) ...@@ -1088,26 +1088,20 @@ static int ov2680_probe(struct i2c_client *client)
mutex_init(&sensor->lock); mutex_init(&sensor->lock);
ret = ov2680_v4l2_init(sensor); ret = ov2680_check_id(sensor);
if (ret < 0) if (ret < 0)
goto lock_destroy; goto lock_destroy;
ret = ov2680_check_id(sensor); ret = ov2680_v4l2_init(sensor);
if (ret < 0) if (ret < 0)
goto error_cleanup; goto lock_destroy;
dev_info(dev, "ov2680 init correctly\n"); dev_info(dev, "ov2680 init correctly\n");
return 0; return 0;
error_cleanup:
dev_err(dev, "ov2680 init fail: %d\n", ret);
media_entity_cleanup(&sensor->sd.entity);
v4l2_async_unregister_subdev(&sensor->sd);
v4l2_ctrl_handler_free(&sensor->ctrls.handler);
lock_destroy: lock_destroy:
dev_err(dev, "ov2680 init fail: %d\n", ret);
mutex_destroy(&sensor->lock); mutex_destroy(&sensor->lock);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment