Commit 1d597682 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-5.14-rc3' of... 

Merge tag 'driver-core-5.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core fixes from Greg KH:
 "Here are two small driver core fixes to resolve some reported problems
  for 5.14-rc3. They include:

   - aux bus memory leak fix

   - unneeded warning message removed when removing a device link.

  Both have been in linux-next with no reported problems"

* tag 'driver-core-5.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  driver core: Prevent warning when removing a device link from unregistered consumer
  driver core: auxiliary bus: Fix memory leak when driver_register() fail
parents 8072911b e64daad6

drivers/base/auxiliary.c

+7 −1
Original line number Diff line number Diff line
@@ -231,6 +231,8 @@ EXPORT_SYMBOL_GPL(auxiliary_find_device); 
int __auxiliary_driver_register(struct auxiliary_driver *auxdrv,

				struct module *owner, const char *modname)

{

	int ret;



	if (WARN_ON(!auxdrv->probe) || WARN_ON(!auxdrv->id_table))

		return -EINVAL;
@@ -246,7 +248,11 @@ int __auxiliary_driver_register(struct auxiliary_driver *auxdrv, 
	auxdrv->driver.bus = &auxiliary_bus_type;

	auxdrv->driver.mod_name = modname;



	return driver_register(&auxdrv->driver);

	ret = driver_register(&auxdrv->driver);

	if (ret)

		kfree(auxdrv->driver.name);



	return ret;

}

EXPORT_SYMBOL_GPL(__auxiliary_driver_register);

drivers/base/core.c

+4 −2
Original line number Diff line number Diff line
@@ -574,8 +574,10 @@ static void devlink_remove_symlinks(struct device *dev, 
		return;

	}



	if (device_is_registered(con)) {

		snprintf(buf, len, "supplier:%s:%s", dev_bus_name(sup), dev_name(sup));

		sysfs_remove_link(&con->kobj, buf);

	}

	snprintf(buf, len, "consumer:%s:%s", dev_bus_name(con), dev_name(con));

	sysfs_remove_link(&sup->kobj, buf);

	kfree(buf);