]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
drm/amd/psp: Fix sysfs: cannot create duplicate filename
authorAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Fri, 16 Oct 2020 14:50:44 +0000 (10:50 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Nov 2020 10:51:54 +0000 (11:51 +0100)
commit f1bcddffe46b349a82445a8d9efd5f5fcb72557f upstream.

psp sysfs not cleaned up on driver unload for sienna_cichlid

Fixes: ce87c98db428e7 ("drm/amdgpu: Include sienna_cichlid in USBC PD FW support.")
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org # 5.9.x
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

index 06757681b2cecc28bc3888aca376f03506a4cd72..f1cae42dcc36455ff3a6fe81ce1b588f046b689c 100644 (file)
@@ -206,7 +206,8 @@ static int psp_sw_fini(void *handle)
                adev->psp.ta_fw = NULL;
        }
 
-       if (adev->asic_type == CHIP_NAVI10)
+       if (adev->asic_type == CHIP_NAVI10 ||
+           adev->asic_type == CHIP_SIENNA_CICHLID)
                psp_sysfs_fini(adev);
 
        return 0;