From 8aefff26cb7acf68313bab3d378a854d6162a49f Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Wed, 15 Jul 2009 16:00:37 +1000 Subject: [PATCH] --- yaml --- r: 155543 b: refs/heads/master c: 916635bfcae5fec170ccd36f4b451cf7c5d23b9d h: refs/heads/master i: 155541: 90cb6250271942c2df4837c85a315548f6715fb7 155539: 46428afac9c32dcc39a2a5f230116ff294011b3e 155535: ebebaa4d5b37a3b5b2948a358eb67fa45eff5245 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 84bbe9fdc057..c92c734e9b70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42dd8619940a153e950c4d2301cd5e49f7342f99 +refs/heads/master: 916635bfcae5fec170ccd36f4b451cf7c5d23b9d diff --git a/trunk/drivers/gpu/drm/ttm/ttm_bo_vm.c b/trunk/drivers/gpu/drm/ttm/ttm_bo_vm.c index 40b75032ea47..fe949a12fe40 100644 --- a/trunk/drivers/gpu/drm/ttm/ttm_bo_vm.c +++ b/trunk/drivers/gpu/drm/ttm/ttm_bo_vm.c @@ -327,7 +327,7 @@ ssize_t ttm_bo_io(struct ttm_bo_device *bdev, struct file *filp, goto out_unref; kmap_offset = dev_offset - bo->vm_node->start; - if (unlikely(kmap_offset) >= bo->num_pages) { + if (unlikely(kmap_offset >= bo->num_pages)) { ret = -EFBIG; goto out_unref; } @@ -401,7 +401,7 @@ ssize_t ttm_bo_fbdev_io(struct ttm_buffer_object *bo, const char __user *wbuf, bool dummy; kmap_offset = (*f_pos >> PAGE_SHIFT); - if (unlikely(kmap_offset) >= bo->num_pages) + if (unlikely(kmap_offset >= bo->num_pages)) return -EFBIG; page_offset = *f_pos & ~PAGE_MASK;