diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-07-15 10:29:00 +0900 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-10-27 22:14:48 -0400 |
| commit | 6e046d33a18c008065d9d3b7448f244e55e53897 (patch) | |
| tree | de03c59b0c564d654f7858f7cf2259cecd5c2f95 | |
| parent | ab0a85f0cb4fcf6390d223d53bddf9478a8a27f9 (diff) | |
| download | lwn-6e046d33a18c008065d9d3b7448f244e55e53897.tar.gz lwn-6e046d33a18c008065d9d3b7448f244e55e53897.zip | |
devres: fix devres_get()
[ Upstream commit 64526370d11ce8868ca495723d595b61e8697fbf ]
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>
Cc: stable <stable@vger.kernel.org> # 2.6.21+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.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 c8a53d1e019f..875464690117 100644 --- 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; - new_dr = NULL; + new_res = NULL; } spin_unlock_irqrestore(&dev->devres_lock, flags); - devres_free(new_dr); + devres_free(new_res); return dr->data; } |