aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_gem.c
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2012-02-15 08:42:43 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-03-22 12:44:09 -0400
commiteb2c0c818a4109489de53fd7334c21f1f26f6635 (patch)
treea7ee4788bc8ae3adfa2f428ab523c46c204da37a /drivers/gpu/drm/i915/i915_gem.c
parent777ee96f50d8c3ac4ff3dde9ad69c22779ac88cb (diff)
drm/i915: [dinq] shut up two instances -Wunitialized
Introduced in commit 8461d226 and 8c59967c Signed-off-by: Ben Widawsky <ben@bwidawsk.net> [danvet: s/fix/shut up/ in the commit msg.] Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 863e14ac0406..6b1859799e6c 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -387,7 +387,7 @@ i915_gem_shmem_pread_slow(struct drm_device *dev,
387 char __user *user_data; 387 char __user *user_data;
388 ssize_t remain; 388 ssize_t remain;
389 loff_t offset; 389 loff_t offset;
390 int shmem_page_offset, page_length, ret; 390 int shmem_page_offset, page_length, ret = 0;
391 int obj_do_bit17_swizzling, page_do_bit17_swizzling; 391 int obj_do_bit17_swizzling, page_do_bit17_swizzling;
392 392
393 user_data = (char __user *) (uintptr_t) args->data_ptr; 393 user_data = (char __user *) (uintptr_t) args->data_ptr;
@@ -794,7 +794,7 @@ i915_gem_shmem_pwrite_slow(struct drm_device *dev,
794 ssize_t remain; 794 ssize_t remain;
795 loff_t offset; 795 loff_t offset;
796 char __user *user_data; 796 char __user *user_data;
797 int shmem_page_offset, page_length, ret; 797 int shmem_page_offset, page_length, ret = 0;
798 int obj_do_bit17_swizzling, page_do_bit17_swizzling; 798 int obj_do_bit17_swizzling, page_do_bit17_swizzling;
799 799
800 user_data = (char __user *) (uintptr_t) args->data_ptr; 800 user_data = (char __user *) (uintptr_t) args->data_ptr;