From: "Akinobu Mita" <akinobu.mita@gmail.com>

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/base/core.c |    2 ++
 1 file changed, 2 insertions(+)

diff -puN drivers/base/core.c~driver-core-add-missing-symlinks-error-handling drivers/base/core.c
--- a/drivers/base/core.c~driver-core-add-missing-symlinks-error-handling
+++ a/drivers/base/core.c
@@ -665,6 +665,8 @@ int device_add(struct device *dev)
  GroupError:
 	device_remove_attrs(dev);
  AttrsError:
+	device_remove_links(dev, parent);
+
 	if (dev->devt_attr) {
 		device_remove_file(dev, dev->devt_attr);
 		kfree(dev->devt_attr);
_