media: v4l2-core: fix entity initialization in device_register_subdev
PATCH 1/1 media: v4l2-core: fix entity initialization in device_register_subdev
The check for parameters is done below in the function. Initialize the entity variable properly, after the parameters have been checked.
--- drivers/media/v4l2-core/v4l2-device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/media/v4l2-core/v4l2-device.c +2 -1
@@ -112,7 +112,7 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev, struct v4l2_subdev *sd) {#if defined(CONFIG_MEDIA_CONTROLLER ) -struct media_entity *entity = &sd->entity; +struct media_entity *entity;#endif int err;
@@ -141,6 +141,7 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev, goto error_module;#if defined(CONFIG_MEDIA_CONTROLLER ) + entity = &sd->entity;/* Register the entity. */ if (v4l2_dev->mdev) { err =media_device_register_entity (v4l2_dev->mdev, entity);
Signature · 1 line
2.20.1
Hi Eugen,
Quoted 24 lines · Eugen Hristev
The check for parameters is done below in the function. Initialize the entity variable properly, after the parameters have been checked.
Fixes 61f5db549dde ("[media] v4l: Make v4l2_subdev inherit from media_entity")Signed-off-by Eugen Hristev <[email protected]>--- drivers/media/v4l2-core/v4l2-device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/media/v4l2-core/v4l2-device.c +1
-1@@ -112,7 +112,7 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev, struct v4l2_subdev *sd) {#if defined(CONFIG_MEDIA_CONTROLLER ) -struct media_entity *entity = &sd->entity; +struct media_entity *entity;#endif int err;
drivers/media/v4l2-core/v4l2-device.c int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev, · line 147
Quoted 7 lines
drivers/media/v4l2-core/v4l2-device.c +1
-0@@ -141,6 +141,7 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev, goto error_module;#if defined(CONFIG_MEDIA_CONTROLLER ) + entity = &sd->entity;/* Register the entity. */ if (v4l2_dev->mdev) { err =media_device_register_entity (v4l2_dev->mdev, entity);
Thanks for the patch.
Instead of keeping a shorthand for entity locally, I'd just refer to &sd->entity. It's more simple, and gets away with one pair of #if / #endif as well.
Signature · 3 lines
Regards, Sakari Ailus
Quoted 37 lines · Sakari Ailus
Hi Eugen,
Quoted 24 lines · Eugen Hristev
The check for parameters is done below in the function. Initialize the entity variable properly, after the parameters have been checked.
Fixes 61f5db549dde ("[media] v4l: Make v4l2_subdev inherit from media_entity")Signed-off-by Eugen Hristev <[email protected]>--- drivers/media/v4l2-core/v4l2-device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/media/v4l2-core/v4l2-device.c +1
-1@@ -112,7 +112,7 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev, struct v4l2_subdev *sd) {#if defined(CONFIG_MEDIA_CONTROLLER ) -struct media_entity *entity = &sd->entity; +struct media_entity *entity;#endif int err;drivers/media/v4l2-core/v4l2-device.c int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev, · line 147
Quoted 7 lines
drivers/media/v4l2-core/v4l2-device.c +1
-0@@ -141,6 +141,7 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev, goto error_module;#if defined(CONFIG_MEDIA_CONTROLLER ) + entity = &sd->entity;/* Register the entity. */ if (v4l2_dev->mdev) { err =media_device_register_entity (v4l2_dev->mdev, entity);Thanks for the patch.
Quoted 3 lines
Instead of keeping a shorthand for entity locally, I'd just refer to
&sd->entity. It's more simple, and gets away with one pair of #if / #endif as well.
Hi,
I thought about that as well, but considered to modify as little as possible the original code.
Will send a v2.
Eugen
Quoted 6 lines
--
Regards,Sakari Ailus