From patchwork Mon Sep 13 13:12:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 509754 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp582765jao; Mon, 13 Sep 2021 07:00:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/FTxQh2BNp0KwLAYtVHjAUTxnTsgJUAiCkWnoa3OcT20wcXI3385sF9EuzvXoLQoIKgtK X-Received: by 2002:a05:6e02:1747:: with SMTP id y7mr8354475ill.5.1631541617445; Mon, 13 Sep 2021 07:00:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631541617; cv=none; d=google.com; s=arc-20160816; b=HH3aR1oO4k3wglYWvZqOqc6YKm3Tn3vTYYFYVUAPklnNx1/p2F1B5UEfXxH8Fv5AnZ lF+Bt8EFLo46NevpU8lMhO/HgPcHMClWDdX7P2K+fWyJKvJrrfdLLTFE3movZ/fvMy0T bZUmvT40fM/yXdwo8dKR3nANqEbZtKWTWnm8MJ6q2S4C0Ve4KLyAb4NtyxaAYWpq4GFP 2I5X+ITqwF9ihk/udGkj41BuD9cpTuqe/MDqrUAsqKfmMT/HkjU0vwBuj74kudipq8Z9 HFgPXqV+jh8aZQe6lklK5NsWwNNNJePW5AjizNMnzFnmbvkpzDcNTOeUUiTB2ULnUkvB 5UYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mIfhb6zDkSE71VkkvNXW+NpfmzQKT8vdC63HzJveXcc=; b=aAJhFlkHeglsaiyDvA6oH+w2DdfYDZEUMaOL2FeC/+GQQRSG24UNymMleLUu5RhqhW K9RjEb5xsJEsTvxTVZRYgVyMhJb9ClC/1Jr6sEsRiIixer70WSNSQdpfHqhMT0hlSkSH 3/YDmYXyVWeDl/XSN9o62Uzgf8cXeVwYIC2sobhJMtGV4VLayv1q0zhx5q+fTsJaJALS 0MGpEbwzyzcwHLf3Wlj+AcN0sJgOCw3bnuzyTJbcZf8EkvnigtpoilDnB+hy4y30j2xl PhAF3JZugc6KwrdC2Wrb6TxHIQ/RbY5Vvi5KnXaw/nPEOoKJtubYiHhLTePme8s83tOc NcIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=V1CoEEOK; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m1si7419272ilu.13.2021.09.13.07.00.17; Mon, 13 Sep 2021 07:00:17 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=V1CoEEOK; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343944AbhIMOBa (ORCPT + 11 others); Mon, 13 Sep 2021 10:01:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:50892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245730AbhIMN71 (ORCPT ); Mon, 13 Sep 2021 09:59:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 00C73610FE; Mon, 13 Sep 2021 13:37:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631540225; bh=IFq5a1R/bvoW7J5KJC/aQ63k1a7K0dBrSifk+UHnhCM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V1CoEEOKAKAv3oQW8DTJzKg9Fzi4yrOwMAgEkDqBwCud80FgdmNPBIC+sA6EcvHyP oLjGLbNgXsIdeb3TVE6MeueGbwYw3VQSF9KfZdBe36/LO5oa4JJjdv3K9o0Z1XAqzF F/aeAUrv/2Gkjw6KhENUHmfZnOCUodC6FHqm5K5A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , Zhen Lei , Sasha Levin Subject: [PATCH 5.13 105/300] driver core: Fix error return code in really_probe() Date: Mon, 13 Sep 2021 15:12:46 +0200 Message-Id: <20210913131112.920112329@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131109.253835823@linuxfoundation.org> References: <20210913131109.253835823@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Zhen Lei [ Upstream commit f04948dea236b000da09c466a7ec931ecd8d7867 ] In the case of error handling, the error code returned by the subfunction should be propagated instead of 0. Fixes: 1901fb2604fb ("Driver core: fix "driver" symlink timing") Fixes: 23b6904442d0 ("driver core: add dev_groups to all drivers") Fixes: 8fd456ec0cf0 ("driver core: Add state_synced sysfs file for devices that support it") Reported-by: Hulk Robot Signed-off-by: Zhen Lei Link: https://lore.kernel.org/r/20210707074301.2722-1-thunder.leizhen@huawei.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/base/dd.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) -- 2.30.2 diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 592b3955abe2..a421da0c9c01 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -560,7 +560,8 @@ re_probe: goto probe_failed; } - if (driver_sysfs_add(dev)) { + ret = driver_sysfs_add(dev); + if (ret) { pr_err("%s: driver_sysfs_add(%s) failed\n", __func__, dev_name(dev)); goto probe_failed; @@ -582,15 +583,18 @@ re_probe: goto probe_failed; } - if (device_add_groups(dev, drv->dev_groups)) { + ret = device_add_groups(dev, drv->dev_groups); + if (ret) { dev_err(dev, "device_add_groups() failed\n"); goto dev_groups_failed; } - if (dev_has_sync_state(dev) && - device_create_file(dev, &dev_attr_state_synced)) { - dev_err(dev, "state_synced sysfs add failed\n"); - goto dev_sysfs_state_synced_failed; + if (dev_has_sync_state(dev)) { + ret = device_create_file(dev, &dev_attr_state_synced); + if (ret) { + dev_err(dev, "state_synced sysfs add failed\n"); + goto dev_sysfs_state_synced_failed; + } } if (test_remove) {