diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-07-15 10:29:00 +0900 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2016-08-26 20:01:20 +0200 |
| commit | 417a156e82685aecdc67ead28c5946d7fdbe00fa (patch) | |
| tree | 22a29929973639f9cd665d6fa1f1ea25f669a612 | |
| parent | 1119ee37836da39b9c756ee29b4ef9bf5cdb160e (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: Stefan Guendhoer <stefan@guendhoer.com>
| -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 507379e7b..4e2fb405d 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -296,10 +296,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; } |