diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2013-01-17 16:15:55 -0500 |
commit | 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch) | |
tree | a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/video/g364fb.c | |
parent | 406089d01562f1e2bf9f089fd7637009ebaad589 (diff) |
Patched in Tegra support.
Diffstat (limited to 'drivers/video/g364fb.c')
-rw-r--r-- | drivers/video/g364fb.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/g364fb.c b/drivers/video/g364fb.c index 223896cc5f7..d662317d85e 100644 --- a/drivers/video/g364fb.c +++ b/drivers/video/g364fb.c | |||
@@ -149,11 +149,10 @@ int g364fb_cursor(struct fb_info *info, struct fb_cursor *cursor) | |||
149 | static int g364fb_pan_display(struct fb_var_screeninfo *var, | 149 | static int g364fb_pan_display(struct fb_var_screeninfo *var, |
150 | struct fb_info *info) | 150 | struct fb_info *info) |
151 | { | 151 | { |
152 | if (var->xoffset || | 152 | if (var->xoffset || var->yoffset + var->yres > var->yres_virtual) |
153 | var->yoffset + info->var.yres > info->var.yres_virtual) | ||
154 | return -EINVAL; | 153 | return -EINVAL; |
155 | 154 | ||
156 | *(unsigned int *) TOP_REG = var->yoffset * info->var.xres; | 155 | *(unsigned int *) TOP_REG = var->yoffset * var->xres; |
157 | return 0; | 156 | return 0; |
158 | } | 157 | } |
159 | 158 | ||