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 <sakari.ailus@linux.intel.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
This commit is contained in:
parent
09ef952138
commit
7a8212f3bc
|
|
@ -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
|
||||
* @__entity: pointer to &struct media_entity, may be NULL
|
||||
*/
|
||||
#define media_entity_to_video_device(__entity) \
|
||||
container_of(__entity, struct video_device, entity)
|
||||
#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
|
||||
|
|
|
|||
Loading…
Reference in New Issue