UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

devres: fix devres_get() 

Currently, devres_get() passes devres_free() the pointer to devres,
but devres_free() should be given with the pointer to resource data.

Fixes: 9ac7849e35 ("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>
This commit is contained in:
Masahiro Yamada 2015-07-15 10:29:00 +09:00 committed by Greg Kroah-Hartman
parent cbfe8fa6cd
commit 64526370d1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/base/devres.c
View File

@ -297,10 +297,10 @@ void * devres_get(struct device *dev, void *new_res,
if (!dr) { if (!dr) {
add_dr(dev, &new_dr->node); add_dr(dev, &new_dr->node);
dr = new_dr; 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;
} }