Merge tag 'dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / base / dd.c

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 437cd61..68ea1f9 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) {