diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-07-15 10:29:00 +0900 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2015-12-06 00:49:07 +0100 |
| commit | 9bc0d0094ad62c1b6f957e1e148c08f3df3adc81 (patch) | |
| tree | c1045f5e85c98e927790770f31f9b2886812bacc | |
| parent | 8c367f5ca8f739e9664de6b55ed66912ac861eef (diff) | |
devres: fix devres_get()
commit 64526370d11ce8868ca495723d595b61e8697fbf upstream.
Currently, devres_get() passes devres_free() the pointer to devres,
but devres_free() should be given with the pointer to resource data.
Fixes: 9ac7849e35f7 ("devres: device resource management")
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
(cherry picked from commit ebc0ae5a7159086a992f7904dc9ad849a13eecfc)
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | drivers/base/devres.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/devres.c b/drivers/base/devres.c index 05dd307e8f02..6d022dc77b79 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -253,10 +253,10 @@ void * devres_get(struct device *dev, void *new_res, if (!dr) { add_dr(dev, &new_dr->node); dr = new_dr; - new_dr = NULL; + new_res = NULL; } spin_unlock_irqrestore(&dev->devres_lock, flags); - devres_free(new_dr); + devres_free(new_res); return dr->data; } |