Skip to contentSkip to conversation

patch "devres: fix devres_get()" added to driver-core-testing

PATCH [email protected] 1 participant 1 message Aug 5, 2015

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

devres: fix devres_get()

to my driver-core git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
in the driver-core-testing branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will be merged to the driver-core-next branch sometime soon, after it passes testing, and the merge window is open.

If you have any questions about this process, please let me know.

Quoted 1 line

From 64526370d11ce8868ca495723d595b61e8697fbf Mon Sep 17 00:00:00 2001

From: Masahiro Yamada <[email protected]>
Date: Wed, 15 Jul 2015 10:29:00 +0900
Subject: 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 9ac7849e35f7 ("devres: device resource management")
Cc stable <[email protected]> # 2.6.21+
---
 drivers/base/devres.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/devres.c +2 -2
index c8a53d1e019f..875464690117 100644
@@ -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;
 }
Signature · 1 line
2.5.0