Commit f04948de authored by Zhen Lei's avatar Zhen Lei Committed by Greg Kroah-Hartman
Browse files

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: 1901fb26 ("Driver core: fix "driver" symlink timing")
Fixes: 23b69044 ("driver core: add dev_groups to all drivers")
Fixes: 8fd456ec ("driver core: Add state_synced sysfs file for devices that support it")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Link: https://lore.kernel.org/r/20210707074301.2722-1-thunder.leizhen@huawei.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3ecc8cb7

drivers/base/dd.c

+10 −6
Original line number Diff line number Diff line
@@ -580,7 +580,8 @@ static int really_probe(struct device *dev, struct device_driver *drv) 
			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,16 +603,19 @@ static int really_probe(struct device *dev, struct device_driver *drv) 
		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)) {

	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) {

		test_remove = false;