diff options
author | Mark Brown <broonie@kernel.org> | 2020-08-25 13:01:58 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-08-25 13:01:58 +0300 |
commit | 3485e56cb8e618d9cb7e74db3606c00d818d1a0d (patch) | |
tree | e7e8c42082e40bfe2c3eebbfed23bf1bbde3f4d9 /drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | |
parent | c8b2c8949c45b01d75237331fc1387036b952d58 (diff) | |
parent | d012a7190fc1fd72ed48911e77ca97ba4521bccd (diff) | |
download | linux-3485e56cb8e618d9cb7e74db3606c00d818d1a0d.tar.xz |
Merge tag 'v5.9-rc2' into regulator-5.10
Linux 5.9-rc2
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index bcce4c0be462..1bedb416eebd 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -1243,7 +1243,6 @@ void amdgpu_ras_debugfs_remove(struct amdgpu_device *adev, if (!obj || !obj->ent) return; - debugfs_remove(obj->ent); obj->ent = NULL; put_obj(obj); } @@ -1257,7 +1256,6 @@ static void amdgpu_ras_debugfs_remove_all(struct amdgpu_device *adev) amdgpu_ras_debugfs_remove(adev, &obj->head); } - debugfs_remove_recursive(con->dir); con->dir = NULL; } /* debugfs end */ |