Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 502c54428570..8d1aebc3e857 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -221,13 +221,11 @@ __untrack_all_wakerefs(struct intel_runtime_pm_debug *debug,
 static void
 dump_and_free_wakeref_tracking(struct intel_runtime_pm_debug *debug)
 {
-        struct drm_printer p;
+        if (debug->count) {
+                struct drm_printer p = drm_debug_printer("i915");
 
-        if (!debug->count)
-                return;
-
-        p = drm_debug_printer("i915");
-        __print_intel_runtime_pm_wakeref(&p, debug);
+                __print_intel_runtime_pm_wakeref(&p, debug);
+        }
 
         kfree(debug->owners);
 }