diff options
| author | Rob Clark <rob@ti.com> | 2012-06-25 13:51:52 -0500 |
|---|---|---|
| committer | Xavier Boudet <x-boudet@ti.com> | 2012-07-10 17:26:54 +0200 |
| commit | 03ab7d1e21d6516738ece9e46a3b2bd14ce15c0b (patch) | |
| tree | 40f20e31baba6bb222dfe6549544e552327ea630 | |
| parent | 1fcebfedbb0be855a60e7bf4fcc5d31a7242a3b1 (diff) | |
omapdce: simplify the logic a bit
Signed-off-by: Rob Clark <rob@ti.com>
| -rw-r--r-- | drivers/staging/omapdce/dce.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/omapdce/dce.c b/drivers/staging/omapdce/dce.c index 79ec3b3b04b2..f7c351a81fad 100644 --- a/drivers/staging/omapdce/dce.c +++ b/drivers/staging/omapdce/dce.c @@ -675,7 +675,7 @@ static inline struct drm_gem_object * handle_single_buf_desc( { struct drm_gem_object *obj; uint32_t flags; - int32_t offset; + int32_t offset = 0; /* maybe support remapping user ptrs later on.. */ if (desc->mem_type != XDM_MEMTYPE_BO && @@ -687,16 +687,13 @@ static inline struct drm_gem_object * handle_single_buf_desc( * passed to _process */ offset = desc->buf; desc->buf = base_bo; - } else { - offset = -1; } obj = get_paddr(priv, req, &desc->buf, desc->buf); if (IS_ERR(obj)) return obj; - if (offset != -1) - desc->buf += offset; + desc->buf += offset; flags = omap_gem_flags(obj); switch(flags & OMAP_BO_TILED) { |