]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
uvesafb: Really allow mtrr being 0, as documented and warn()ed
authorSylvain 'ythier' Hitier <sylvain.hitier@gmail.com>
Fri, 12 Jul 2013 16:25:54 +0000 (18:25 +0200)
committerDave Airlie <airlied@redhat.com>
Tue, 16 Jul 2013 00:24:28 +0000 (10:24 +1000)
Fixup for commit "uvesafb: Clean up MTRR code"
    (63e28a7a5ffce59b645ca9cbcc01e1e8be56bd75)

Signed-off-by: Sylvain "ythier" Hitier <sylvain.hitier@gmail.com>
Acked-by: Andy Lutomirski <luto@amacapital.net>
Also-spotted-by: Torsten Kaiser <just.for.lkml@googlemail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/video/uvesafb.c

index b963ea12d175b1527242ab790cd86b982a60f749..7aec6f39fdd5461beb16d700ed201212ba9d1704 100644 (file)
@@ -1891,7 +1891,7 @@ static int uvesafb_setup(char *options)
                }
        }
 
-       if (mtrr != 3 && mtrr != 1)
+       if (mtrr != 3 && mtrr != 0)
                pr_warn("uvesafb: mtrr should be set to 0 or 3; %d is unsupported", mtrr);
 
        return 0;