Merge tag 'vfs-6.13-rc7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

[J-linux.git] / drivers / gpu / drm / i915 / intel_runtime_pm.c

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index a21f5a1c89bc5d816830c84cce815f78bad7e3d6..1a47ecfd3fd875eac03629dba5aba95cbc5f773c 100644 (file)
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -250,7 +250,7 @@ static intel_wakeref_t __intel_runtime_pm_get_if_active(struct intel_runtime_pm
                     pm_runtime_get_if_active(rpm->kdev) <= 0) ||
                    (!ignore_usecount &&
                     pm_runtime_get_if_in_use(rpm->kdev) <= 0))
                     pm_runtime_get_if_active(rpm->kdev) <= 0) ||
                    (!ignore_usecount &&
                     pm_runtime_get_if_in_use(rpm->kdev) <= 0))

-                       return 0;
+                       return NULL;

        }
 
        intel_runtime_pm_acquire(rpm, true);
        }
 
        intel_runtime_pm_acquire(rpm, true);