From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sat, 2 May 2015 18:25:04 +0000 (+0200)
Subject: 3.19-stable patches
X-Git-Tag: v3.10.77~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fe991ce88938e212f3b43f24b2afd5f66bbf53e;p=thirdparty%2Fkernel%2Fstable-queue.git

3.19-stable patches

added patches:
	driver-core-bus-goto-appropriate-labels-on-failure-in-bus_add_device.patch
---

diff --git a/queue-3.19/driver-core-bus-goto-appropriate-labels-on-failure-in-bus_add_device.patch b/queue-3.19/driver-core-bus-goto-appropriate-labels-on-failure-in-bus_add_device.patch
new file mode 100644
index 00000000000..3d330c03684
--- /dev/null
+++ b/queue-3.19/driver-core-bus-goto-appropriate-labels-on-failure-in-bus_add_device.patch
@@ -0,0 +1,39 @@
+From 1c34203a1496d1849ba978021b878b3447d433c8 Mon Sep 17 00:00:00 2001
+From: Junjie Mao <junjie_mao@yeah.net>
+Date: Wed, 28 Jan 2015 10:02:44 +0800
+Subject: driver core: bus: Goto appropriate labels on failure in bus_add_device
+
+From: Junjie Mao <junjie_mao@yeah.net>
+
+commit 1c34203a1496d1849ba978021b878b3447d433c8 upstream.
+
+It is not necessary to call device_remove_groups() when device_add_groups()
+fails.
+
+The group added by device_add_groups() should be removed if sysfs_create_link()
+fails.
+
+Fixes: fa6fdb33b486 ("driver core: bus_type: add dev_groups")
+Signed-off-by: Junjie Mao <junjie_mao@yeah.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/base/bus.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/base/bus.c
++++ b/drivers/base/bus.c
+@@ -515,11 +515,11 @@ int bus_add_device(struct device *dev)
+ 			goto out_put;
+ 		error = device_add_groups(dev, bus->dev_groups);
+ 		if (error)
+-			goto out_groups;
++			goto out_id;
+ 		error = sysfs_create_link(&bus->p->devices_kset->kobj,
+ 						&dev->kobj, dev_name(dev));
+ 		if (error)
+-			goto out_id;
++			goto out_groups;
+ 		error = sysfs_create_link(&dev->kobj,
+ 				&dev->bus->p->subsys.kobj, "subsystem");
+ 		if (error)
diff --git a/queue-3.19/series b/queue-3.19/series
index 93cda04a3eb..0de49efacb6 100644
--- a/queue-3.19/series
+++ b/queue-3.19/series
@@ -173,3 +173,4 @@ crypto-omap-aes-fix-support-for-unequal-lengths.patch
 c6x-time-ensure-consistency-in-__init.patch
 memstick-mspro_block-add-missing-curly-braces.patch
 drivers-platform-parse-irq-flags-from-resources.patch
+driver-core-bus-goto-appropriate-labels-on-failure-in-bus_add_device.patch