Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad07f124 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull driver core fix from Greg KH:
 "Here is a single driver core patch for 3.14-rc3 for the component code
  that Russell has found and fixed"

* tag 'driver-core-3.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  drivers/base: fix devres handling for master device
parents bb0a05d7 9e1ccb4a

drivers/base/component.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -133,9 +133,16 @@ static int try_to_bring_up_master(struct master *master, 
			goto out;

			goto out;

		}

		}





		if (!devres_open_group(master->dev, NULL, GFP_KERNEL)) {

			ret = -ENOMEM;

			goto out;

		}



		/* Found all components */

		/* Found all components */

		ret = master->ops->bind(master->dev);

		ret = master->ops->bind(master->dev);

		if (ret < 0) {

		if (ret < 0) {

			devres_release_group(master->dev, NULL);

			dev_info(master->dev, "master bind failed: %d\n", ret);

			master_remove_components(master);

			master_remove_components(master);

			goto out;

			goto out;

		}

		}
@@ -166,6 +173,7 @@ static void take_down_master(struct master *master) 
{

{

	if (master->bound) {

	if (master->bound) {

		master->ops->unbind(master->dev);

		master->ops->unbind(master->dev);

		devres_release_group(master->dev, NULL);

		master->bound = false;

		master->bound = false;

	}

	}