net/mlx5: Fix race between PCI error handlers and health work

[cascardo/linux.git] / drivers / media / media-entity.c

diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index d8a2299..c68239e 100644 (file)
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -65,6 +65,8 @@ static inline const char *intf_type(struct media_interface *intf)
                return "v4l-subdev";
        case MEDIA_INTF_T_V4L_SWRADIO:
                return "v4l-swradio";
+       case MEDIA_INTF_T_V4L_TOUCH:
+               return "v4l-touch";
        case MEDIA_INTF_T_ALSA_PCM_CAPTURE:
                return "alsa-pcm-capture";
        case MEDIA_INTF_T_ALSA_PCM_PLAYBACK:
@@ -806,17 +808,18 @@ int __media_entity_setup_link(struct media_link *link, u32 flags)
 
        mdev = source->graph_obj.mdev;
 
-       if (mdev->link_notify) {
-               ret = mdev->link_notify(link, flags,
-                                       MEDIA_DEV_NOTIFY_PRE_LINK_CH);
+       if (mdev->ops && mdev->ops->link_notify) {
+               ret = mdev->ops->link_notify(link, flags,
+                                            MEDIA_DEV_NOTIFY_PRE_LINK_CH);
                if (ret < 0)
                        return ret;
        }
 
        ret = __media_entity_setup_link_notify(link, flags);
 
-       if (mdev->link_notify)
-               mdev->link_notify(link, flags, MEDIA_DEV_NOTIFY_POST_LINK_CH);
+       if (mdev->ops && mdev->ops->link_notify)
+               mdev->ops->link_notify(link, flags,
+                                      MEDIA_DEV_NOTIFY_POST_LINK_CH);
 
        return ret;
 }