diff options
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_gem.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/omap_gem.c | 6 | 
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c index 9201c21e206f..a6562d23d314 100644 --- a/drivers/gpu/drm/omapdrm/omap_gem.c +++ b/drivers/gpu/drm/omapdrm/omap_gem.c @@ -819,9 +819,11 @@ int omap_gem_pin(struct drm_gem_object *obj, dma_addr_t *dma_addr)  			refcount_inc(&omap_obj->dma_addr_cnt);  		} -		*dma_addr = omap_obj->dma_addr; +		if (dma_addr) +			*dma_addr = omap_obj->dma_addr;  	} else if (omap_gem_is_contiguous(omap_obj)) { -		*dma_addr = omap_obj->dma_addr; +		if (dma_addr) +			*dma_addr = omap_obj->dma_addr;  	} else {  		ret = -EINVAL;  		goto fail;  | 
