From: Johan Hovold <johan@hovoldconsulting.com>
Date: Wed, 11 Nov 2015 09:07:03 +0000 (+0100)
Subject: greybus: battery: fix class-device parent
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cd414d472637a30104b4908f5f239f3c06d90fe9;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

greybus: battery: fix class-device parent

Greybus bundle drivers should register their class devices as children
to the bundle device that they bind to.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/drivers/staging/greybus/battery.c b/drivers/staging/greybus/battery.c
index 6b354de146d1..e119775fb19b 100644
--- a/drivers/staging/greybus/battery.c
+++ b/drivers/staging/greybus/battery.c
@@ -244,7 +244,7 @@ static int init_and_register(struct gb_connection *connection,
 	gb->bat.num_properties	= ARRAY_SIZE(battery_props);
 	gb->bat.get_property	= get_property;
 
-	return power_supply_register(&connection->bundle->intf->dev, &gb->bat);
+	return power_supply_register(&connection->bundle->dev, &gb->bat);
 }
 #else
 static int init_and_register(struct gb_connection *connection,
@@ -262,7 +262,7 @@ static int init_and_register(struct gb_connection *connection,
 	gb->desc.num_properties	= ARRAY_SIZE(battery_props);
 	gb->desc.get_property	= get_property;
 
-	gb->bat = power_supply_register(&connection->bundle->intf->dev,
+	gb->bat = power_supply_register(&connection->bundle->dev,
 					&gb->desc, &cfg);
 	if (IS_ERR(gb->bat))
 		return PTR_ERR(gb->bat);