driver core: Fix error return code in really_probe()

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 <hulkci@huawei.com>
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Link: https://lore.kernel.org/r/20210707074301.2722-1-thunder.leizhen@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index daeb9b5763ae353b226559923cd64673498a2397..2b8cdb78384ca26178a6d89e4aa8af38c190b322 100644 (file)
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -580,7 +580,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;
@@ -602,15 +603,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) {