]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
drm/i915/dma: enforce pr_<loglevel> consistency
authorIoan-Adrian Ratiu <adi@adirat.com>
Fri, 30 Oct 2015 23:16:00 +0000 (01:16 +0200)
committerJani Nikula <jani.nikula@intel.com>
Mon, 2 Nov 2015 09:08:24 +0000 (11:08 +0200)
One branch of the if clause uses pr_info, the other pr_err; change
the 'false' branch to also use pr_info. This minor oversight has gone
unfixed since the initial vga_switcheroo implementation in 6a9ee8af.

Signed-off-by: Ioan-Adrian Ratiu <adi@adirat.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1446246960-22620-1-git-send-email-adi@adirat.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_dma.c

index 55d1064f4451dd2b04185fb64704504447c1e194..ea8b64b91e34a784342ab89e5c5d6b4157ed1be9 100644 (file)
@@ -367,7 +367,7 @@ static void i915_switcheroo_set_state(struct pci_dev *pdev, enum vga_switcheroo_
                i915_resume_switcheroo(dev);
                dev->switch_power_state = DRM_SWITCH_POWER_ON;
        } else {
-               pr_err("switched off\n");
+               pr_info("switched off\n");
                dev->switch_power_state = DRM_SWITCH_POWER_CHANGING;
                i915_suspend_switcheroo(dev, pmm);
                dev->switch_power_state = DRM_SWITCH_POWER_OFF;