media: v4l: Make media_entity_to_video_device() NULL-safe
PATCH v3 1/1 media: v4l: Make media_entity_to_video_device() NULL-safe
Make media_entity_to_video_device(NULL) return NULL, instead of an invalid pointer value.
Signed-off-by Sakari Ailus <[email protected]>
Reviewed-by Laurent Pinchart <[email protected]>
---
since v2:
- Just new indentation and rewrap a little.
include/media/v4l2-dev.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
include/media/v4l2-dev.h +10 -4
@@ -313,10 +313,16 @@ struct video_device {* media_entity_to_video_device - Returns a &struct video_device from * the &struct media_entity embedded on it. * -* @__entity: pointer to &struct media_entity -*/ -#define media_entity_to_video_device (__entity) \ - container_of(__entity, struct video_device, entity) +* @__entity: pointer to &struct media_entity, may be NULL +*/ +#define media_entity_to_video_device (__entity) \ +({ \ + typeof(__entity) __me_vdev_ent = __entity; \ + \ + __me_vdev_ent ? \ + container_of(__me_vdev_ent, struct video_device, entity) : \ + NULL; \ +})/** * to_video_device - Returns a &struct video_device from the
Signature · 1 line
2.39.5