aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/uvesafb.c
diff options
context:
space:
mode:
authorSylvain 'ythier' Hitier <sylvain.hitier@gmail.com>2013-07-12 18:25:54 +0200
committerDave Airlie <airlied@redhat.com>2013-07-16 10:24:28 +1000
commitd1ce3d5496f2a7c90dd00a9133572f931d2acdcc (patch)
tree979349dd2083a06a3a0cb21d5fbb607fa7f72965 /drivers/video/uvesafb.c
parentMerge branch 'drm-fixes-3.11' of git://people.freedesktop.org/~agd5f/linux (diff)
downloadlinux-dev-d1ce3d5496f2a7c90dd00a9133572f931d2acdcc.tar.xz
linux-dev-d1ce3d5496f2a7c90dd00a9133572f931d2acdcc.zip
uvesafb: Really allow mtrr being 0, as documented and warn()ed
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>
Diffstat (limited to 'drivers/video/uvesafb.c')
-rw-r--r--drivers/video/uvesafb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c
index b963ea12d175..7aec6f39fdd5 100644
--- a/drivers/video/uvesafb.c
+++ b/drivers/video/uvesafb.c
@@ -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;