From patchwork Tue May 11 08:28:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Leizhen \(ThunderTown\)" X-Patchwork-Id: 434169 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp3609431jao; Tue, 11 May 2021 01:29:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgtEkteITVqbWcOZDERolT9l2pCeUdANUqn4qxRF7SWXsDzA1TmvMPippQuojANvtA3hg+ X-Received: by 2002:a17:902:b68c:b029:eb:6c82:60da with SMTP id c12-20020a170902b68cb02900eb6c8260damr29148950pls.25.1620721755175; Tue, 11 May 2021 01:29:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620721755; cv=none; d=google.com; s=arc-20160816; b=wkvtHdJssk5vg+5yx9yJeLEw7Cq3R7/hX5CRm/ZiIz2oLVmLwNZETlZCM5/KIFtt0T EsHZk6hGyKZIt60AjowXBmoT3cBBgWOlWAcbCpnmnA1ZUlyJetkNi7oNt/F8ftdFzNfS tAzMzNdPCQfhc+Ubd/hL+EJ/trtdokX14IsT3NpSGCXBmSFXftWA8cJ7fXDYvB9JneTZ gFVdw4MrH2KBlyEfTfbC4NQcW9dvbkDxle0mGZEztQYonw/gXYgKgOT9zovZIJVFTq7e dHgf0yAxMs0zl2RpsEUULfZ+Sc3SRB5IcMdy8iimU+cFvDDVrI7aqcE4Jx/cH+i9ff+p KhXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :delivered-to; bh=1PmKguI8sElx1vUv3TgSVNxTQnVFe5XO/A75YIGYP6Y=; b=Zrim8i0MemY1HSZ7enw8kYQiE8mLE0UIY8EhHNKqDUV2R9lrfIF2nYdCjOxiAIJOm3 e1Kn/YTr0cGQwdVxTJzzxs4kVE6aGlgfqmwp9yG1MMJNMP6CHW9+iXId85npy6i6YyxK Y9WRxXSXa7Pxhd+5I5IsJbA7BA+N8j6tQkWnXCVkyX36J9Kuu+KGaPlMvUfiKhXB7al+ Pi7dG5lnavmtEp0dA85CCQ6/P+xWi7bxGUO23qeQ78mfqcZiH+CQm/pN1TsGmCJjRGEq iDPYxthAboRl0JCmeYJvvdgfSZ6EAc8AhDUbcmMXoqSLWBzspmIq8N3PcJ8Uv8aMO7yy 66/g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id p5si21371756pgd.357.2021.05.11.01.29.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 01:29:15 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=huawei.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6277E6E9F7; Tue, 11 May 2021 08:29:10 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0BDD86E9F2; Tue, 11 May 2021 08:29:06 +0000 (UTC) Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4FfWHK1jwPzlbM5; Tue, 11 May 2021 16:26:53 +0800 (CST) Received: from thunder-town.china.huawei.com (10.174.177.72) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.498.0; Tue, 11 May 2021 16:28:56 +0800 From: Zhen Lei To: Ben Skeggs , David Airlie , "Daniel Vetter" , Pierre Moreau , dri-devel , nouveau Subject: [PATCH v2 2/2] drm/nouveau: Fix error return code in nouveau_backlight_init() Date: Tue, 11 May 2021 16:28:41 +0800 Message-ID: <20210511082841.4181-3-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20210511082841.4181-1-thunder.leizhen@huawei.com> References: <20210511082841.4181-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.177.72] X-CFilter-Loop: Reflected X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhen Lei Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: db1a0ae21461 ("drm/nouveau/bl: Assign different names to interfaces") Suggested-by: Pierre Moreau Signed-off-by: Zhen Lei --- drivers/gpu/drm/nouveau/nouveau_backlight.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.26.0.106.g9fadedd Reviewed-by: Pierre Moreau diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c index d1c998e645fb4b6..f0856adbe775624 100644 --- a/drivers/gpu/drm/nouveau/nouveau_backlight.c +++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c @@ -47,20 +47,20 @@ struct nouveau_backlight { int id; }; -static bool +static int nouveau_get_backlight_name(char backlight_name[BL_NAME_SIZE], struct nouveau_backlight *bl) { int nb = ida_simple_get(&bl_ida, 0, 100, GFP_KERNEL); if (nb < 0) - return false; + return nb; if (nb > 0) snprintf(backlight_name, BL_NAME_SIZE, "nv_backlight%d", nb); else snprintf(backlight_name, BL_NAME_SIZE, "nv_backlight"); bl->id = nb; - return true; + return 0; } static int @@ -273,7 +273,8 @@ nouveau_backlight_init(struct drm_connector *connector) if (!bl) return -ENOMEM; - if (!nouveau_get_backlight_name(backlight_name, bl)) { + ret = nouveau_get_backlight_name(backlight_name, bl); + if (ret) { NV_ERROR(drm, "Failed to retrieve a unique name for the backlight interface\n"); goto fail_alloc; }