projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[cascardo/linux.git]
/
drivers
/
power
/
power_supply_core.c
diff --git
a/drivers/power/power_supply_core.c
b/drivers/power/power_supply_core.c
index
f44f5b6
..
5520040
100644
(file)
--- a/
drivers/power/power_supply_core.c
+++ b/
drivers/power/power_supply_core.c
@@
-115,8
+115,8
@@
int power_supply_register(struct device *parent, struct power_supply *psy)
{
int rc = 0;
{
int rc = 0;
- psy->dev = device_create
_drvdata(power_supply_class, parent, 0
,
-
psy,
"%s", psy->name);
+ psy->dev = device_create
(power_supply_class, parent, 0, psy
,
+ "%s", psy->name);
if (IS_ERR(psy->dev)) {
rc = PTR_ERR(psy->dev);
goto dev_create_failed;
if (IS_ERR(psy->dev)) {
rc = PTR_ERR(psy->dev);
goto dev_create_failed;