diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-07-15 10:29:00 +0900 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-10-13 03:46:05 +0100 |
| commit | ebc0ae5a7159086a992f7904dc9ad849a13eecfc (patch) | |
| tree | a3eece1b72f6c87969fb6d6831353a136b0610ca | |
| parent | b3170aab0b1a13c7c63061cee5dc3a5d49a65225 (diff) | |
| download | kernel_samsung_smdk4412-ebc0ae5a7159086a992f7904dc9ad849a13eecfc.zip kernel_samsung_smdk4412-ebc0ae5a7159086a992f7904dc9ad849a13eecfc.tar.gz kernel_samsung_smdk4412-ebc0ae5a7159086a992f7904dc9ad849a13eecfc.tar.bz2 | |
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>
| -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 65cd748..cc956a4 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c @@ -254,10 +254,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; } |