Path: csiph.com!au2pb.net!feeder.erje.net!1.eu.feeder.erje.net!weretis.net!feeder1.news.weretis.net!newsfeed.CARNet.hr!news.spin.it!bofh.it!news.nic.it!robomod From: Kamal Mostafa Newsgroups: linux.kernel Subject: [PATCH 3.13.y-ckt 16/85] devres: fix devres_get() Date: Wed, 21 Oct 2015 01:00:03 +0200 Message-ID: References: X-Original-To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com X-Mailer: git-send-email 1.9.1 X-Extended-Stable: 3.13 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 45 Organization: linux.* mail to news gateway X-Original-Cc: Masahiro Yamada , Greg Kroah-Hartman , Kamal Mostafa X-Original-Date: Tue, 20 Oct 2015 14:34:32 -0700 X-Original-Message-ID: <1445376941-7046-17-git-send-email-kamal@canonical.com> X-Original-References: <1445376941-7046-1-git-send-email-kamal@canonical.com> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1252333 3.13.11-ckt28 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Masahiro Yamada 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 Acked-by: Tejun Heo Signed-off-by: Greg Kroah-Hartman Signed-off-by: Kamal Mostafa --- drivers/base/devres.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/base/devres.c b/drivers/base/devres.c index 545c4de..cbe0b58 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; } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/