Merge tag 'f2fs-for-v5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeu...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / drm_lease.c

diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c
index cce5d9dd52ffff65b516bdb035a839110b629fcb..694ff363a90b341d0d7cde9f3ef447905793bcea 100644 (file)
--- a/drivers/gpu/drm/drm_lease.c
+++ b/drivers/gpu/drm/drm_lease.c
@@ -111,7 +111,7 @@ static bool _drm_has_leased(struct drm_master *master, int id)
  */
 bool _drm_lease_held(struct drm_file *file_priv, int id)
 {
-       if (file_priv == NULL || file_priv->master == NULL)
+       if (!file_priv || !file_priv->master)
                return true;
 
        return _drm_lease_held_master(file_priv->master, id);
@@ -133,7 +133,7 @@ bool drm_lease_held(struct drm_file *file_priv, int id)
        struct drm_master *master;
        bool ret;
 
-       if (file_priv == NULL || file_priv->master == NULL)
+       if (!file_priv || !file_priv->master || !file_priv->master->lessor)
                return true;
 
        master = file_priv->master;
@@ -159,7 +159,7 @@ uint32_t drm_lease_filter_crtcs(struct drm_file *file_priv, uint32_t crtcs_in)
        int count_in, count_out;
        uint32_t crtcs_out = 0;
 
-       if (file_priv == NULL || file_priv->master == NULL)
+       if (!file_priv || !file_priv->master || !file_priv->master->lessor)
                return crtcs_in;
 
        master = file_priv->master;