Merge tag 'topic/nouveau-misc-2022-07-27' of git://anongit.freedesktop.org/drm/drm...

[platform/kernel/linux-starfive.git] / drivers / gpu / drm / nouveau / nouveau_connector.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 2549968..43a9d1e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -1362,13 +1362,11 @@ nouveau_connector_create(struct drm_device *dev,
                snprintf(aux_name, sizeof(aux_name), "sor-%04x-%04x",
                         dcbe->hasht, dcbe->hashm);
                nv_connector->aux.name = kstrdup(aux_name, GFP_KERNEL);
-               drm_dp_aux_init(&nv_connector->aux);
-               if (ret) {
-                       NV_ERROR(drm, "Failed to init AUX adapter for sor-%04x-%04x: %d\n",
-                                dcbe->hasht, dcbe->hashm, ret);
+               if (!nv_connector->aux.name) {
                        kfree(nv_connector);
-                       return ERR_PTR(ret);
+                       return ERR_PTR(-ENOMEM);
                }
+               drm_dp_aux_init(&nv_connector->aux);
                fallthrough;
        default:
                funcs = &nouveau_connector_funcs;