projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[linux-2.6-microblaze.git]
/
drivers
/
base
/
devres.c
diff --git
a/drivers/base/devres.c
b/drivers/base/devres.c
index
c8a53d1
..
8754646
100644
(file)
--- a/
drivers/base/devres.c
+++ b/
drivers/base/devres.c
@@
-297,10
+297,10
@@
void * devres_get(struct device *dev, void *new_res,
if (!dr) {
add_dr(dev, &new_dr->node);
dr = new_dr;
if (!dr) {
add_dr(dev, &new_dr->node);
dr = new_dr;
- new_
dr
= NULL;
+ new_
res
= NULL;
}
spin_unlock_irqrestore(&dev->devres_lock, flags);
}
spin_unlock_irqrestore(&dev->devres_lock, flags);
- devres_free(new_
dr
);
+ devres_free(new_
res
);
return dr->data;
}
return dr->data;
}