Commit 64526370 authored Jul 15, 2015 by Masahiro Yamada Committed by Greg Kroah-Hartman Aug 05, 2015

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: 9ac7849e ("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>

parent cbfe8fa6

drivers/base/devres.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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;
	}		}