diff options
| -rw-r--r-- | libdrm/xf86drm.c | 12 | ||||
| -rw-r--r-- | shared-core/drm.h | 14 | 
2 files changed, 13 insertions, 13 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index 862772d5..a815ed7a 100644 --- a/libdrm/xf86drm.c +++ b/libdrm/xf86drm.c @@ -585,9 +585,9 @@ int drmOpen(const char *name, const char *busid)  void drmFreeVersion(drmVersionPtr v)  {      if (!v) return; -    if (v->name) drmFree(v->name); -    if (v->date) drmFree(v->date); -    if (v->desc) drmFree(v->desc); +    drmFree(v->name); +    drmFree(v->date); +    drmFree(v->desc);      drmFree(v);  } @@ -604,9 +604,9 @@ void drmFreeVersion(drmVersionPtr v)  static void drmFreeKernelVersion(drm_version_t *v)  {      if (!v) return; -    if (v->name) drmFree(v->name); -    if (v->date) drmFree(v->date); -    if (v->desc) drmFree(v->desc); +    drmFree(v->name); +    drmFree(v->date); +    drmFree(v->desc);      drmFree(v);  } diff --git a/shared-core/drm.h b/shared-core/drm.h index 6fccec39..447065c7 100644 --- a/shared-core/drm.h +++ b/shared-core/drm.h @@ -678,7 +678,7 @@ typedef struct drm_set_version {  typedef struct drm_fence_arg {  	unsigned handle; -        int class; +	int class;  	unsigned type;  	unsigned flags;  	unsigned signaled; @@ -807,7 +807,7 @@ typedef struct drm_bo_arg_request {  	drm_bo_type_t type;  	unsigned arg_handle;  	drm_u64_t buffer_start; -        unsigned page_alignment; +	unsigned page_alignment;  	unsigned expand_pad[4]; /*Future expansion */  	enum {  		drm_bo_create, @@ -838,11 +838,11 @@ typedef struct drm_bo_arg_reply {  	drm_u64_t size;  	drm_u64_t offset;  	drm_u64_t arg_handle; -        unsigned mask; -        drm_u64_t buffer_start; -        unsigned fence_flags; -        unsigned rep_flags; -        unsigned page_alignment; +	unsigned mask; +	drm_u64_t buffer_start; +	unsigned fence_flags; +	unsigned rep_flags; +	unsigned page_alignment;  	unsigned expand_pad[4]; /*Future expansion */  }drm_bo_arg_reply_t;  | 
