diff options
Diffstat (limited to 'drivers/gpu/drm/drm_atomic.c')
-rw-r--r-- | drivers/gpu/drm/drm_atomic.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 08d03d4594ee..39e470eb8aea 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c | |||
@@ -2238,13 +2238,13 @@ retry: | |||
2238 | } | 2238 | } |
2239 | 2239 | ||
2240 | if (!obj->properties) { | 2240 | if (!obj->properties) { |
2241 | drm_mode_object_unreference(obj); | 2241 | drm_mode_object_put(obj); |
2242 | ret = -ENOENT; | 2242 | ret = -ENOENT; |
2243 | goto out; | 2243 | goto out; |
2244 | } | 2244 | } |
2245 | 2245 | ||
2246 | if (get_user(count_props, count_props_ptr + copied_objs)) { | 2246 | if (get_user(count_props, count_props_ptr + copied_objs)) { |
2247 | drm_mode_object_unreference(obj); | 2247 | drm_mode_object_put(obj); |
2248 | ret = -EFAULT; | 2248 | ret = -EFAULT; |
2249 | goto out; | 2249 | goto out; |
2250 | } | 2250 | } |
@@ -2257,14 +2257,14 @@ retry: | |||
2257 | struct drm_property *prop; | 2257 | struct drm_property *prop; |
2258 | 2258 | ||
2259 | if (get_user(prop_id, props_ptr + copied_props)) { | 2259 | if (get_user(prop_id, props_ptr + copied_props)) { |
2260 | drm_mode_object_unreference(obj); | 2260 | drm_mode_object_put(obj); |
2261 | ret = -EFAULT; | 2261 | ret = -EFAULT; |
2262 | goto out; | 2262 | goto out; |
2263 | } | 2263 | } |
2264 | 2264 | ||
2265 | prop = drm_mode_obj_find_prop_id(obj, prop_id); | 2265 | prop = drm_mode_obj_find_prop_id(obj, prop_id); |
2266 | if (!prop) { | 2266 | if (!prop) { |
2267 | drm_mode_object_unreference(obj); | 2267 | drm_mode_object_put(obj); |
2268 | ret = -ENOENT; | 2268 | ret = -ENOENT; |
2269 | goto out; | 2269 | goto out; |
2270 | } | 2270 | } |
@@ -2272,14 +2272,14 @@ retry: | |||
2272 | if (copy_from_user(&prop_value, | 2272 | if (copy_from_user(&prop_value, |
2273 | prop_values_ptr + copied_props, | 2273 | prop_values_ptr + copied_props, |
2274 | sizeof(prop_value))) { | 2274 | sizeof(prop_value))) { |
2275 | drm_mode_object_unreference(obj); | 2275 | drm_mode_object_put(obj); |
2276 | ret = -EFAULT; | 2276 | ret = -EFAULT; |
2277 | goto out; | 2277 | goto out; |
2278 | } | 2278 | } |
2279 | 2279 | ||
2280 | ret = atomic_set_prop(state, obj, prop, prop_value); | 2280 | ret = atomic_set_prop(state, obj, prop, prop_value); |
2281 | if (ret) { | 2281 | if (ret) { |
2282 | drm_mode_object_unreference(obj); | 2282 | drm_mode_object_put(obj); |
2283 | goto out; | 2283 | goto out; |
2284 | } | 2284 | } |
2285 | 2285 | ||
@@ -2292,7 +2292,7 @@ retry: | |||
2292 | plane_mask |= (1 << drm_plane_index(plane)); | 2292 | plane_mask |= (1 << drm_plane_index(plane)); |
2293 | plane->old_fb = plane->fb; | 2293 | plane->old_fb = plane->fb; |
2294 | } | 2294 | } |
2295 | drm_mode_object_unreference(obj); | 2295 | drm_mode_object_put(obj); |
2296 | } | 2296 | } |
2297 | 2297 | ||
2298 | ret = prepare_crtc_signaling(dev, state, arg, file_priv, &fence_state, | 2298 | ret = prepare_crtc_signaling(dev, state, arg, file_priv, &fence_state, |