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

Commit 82f0cf9b authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

Driver core: fix error by cleanup up symlinks properly 



When a device fails to register the class symlinks where not cleaned up.
This left a symlink in the /sys/class/"device"/ directory that pointed
to no where. This caused the sysfs_follow_link Oops I reported earlier.
This patch cleanups up the symlink. Please apply. Thank you.

Signed-Off: James Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4541ac94

drivers/base/core.c

+30 −1
Original line number Diff line number Diff line
@@ -643,6 +643,35 @@ int device_add(struct device *dev) 
		device_remove_file(dev, dev->devt_attr);

		kfree(dev->devt_attr);

	}



	if (dev->class) {

		sysfs_remove_link(&dev->kobj, "subsystem");

		/* If this is not a "fake" compatible device, remove the

		 * symlink from the class to the device. */

		if (dev->kobj.parent != &dev->class->subsys.kset.kobj)

			sysfs_remove_link(&dev->class->subsys.kset.kobj,

					  dev->bus_id);

#ifdef CONFIG_SYSFS_DEPRECATED

		if (parent) {

			char *class_name = make_class_name(dev->class->name,

							   &dev->kobj);

			if (class_name)

				sysfs_remove_link(&dev->parent->kobj,

						  class_name);

			kfree(class_name);

			sysfs_remove_link(&dev->kobj, "device");

		}

#endif



		down(&dev->class->sem);

		/* notify any interfaces that the device is now gone */

		list_for_each_entry(class_intf, &dev->class->interfaces, node)

			if (class_intf->remove_dev)

				class_intf->remove_dev(dev, class_intf);

		/* remove the device from the class list */

		list_del_init(&dev->node);

		up(&dev->class->sem);

	}

 ueventattrError:

	device_remove_file(dev, &dev->uevent_attr);

 attrError: