diff options
Diffstat (limited to 'drivers/gpu/drm/drm_atomic.c')
| -rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 7 | 
1 files changed, 4 insertions, 3 deletions
| diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 2a3ded44cf2a..23739609427d 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c @@ -837,8 +837,9 @@ static int drm_atomic_plane_check(struct drm_plane *plane,  	/* Check whether this plane supports the fb pixel format. */  	ret = drm_plane_check_pixel_format(plane, state->fb->pixel_format);  	if (ret) { -		DRM_DEBUG_ATOMIC("Invalid pixel format %s\n", -				 drm_get_format_name(state->fb->pixel_format)); +		char *format_name = drm_get_format_name(state->fb->pixel_format); +		DRM_DEBUG_ATOMIC("Invalid pixel format %s\n", format_name); +		kfree(format_name);  		return ret;  	} @@ -1690,7 +1691,7 @@ retry:  				goto out;  			} -			prop = drm_property_find(dev, prop_id); +			prop = drm_mode_obj_find_prop_id(obj, prop_id);  			if (!prop) {  				drm_mode_object_unreference(obj);  				ret = -ENOENT; | 
