aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/devres.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-07-18 06:19:57 -0400
committerIngo Molnar <mingo@elte.hu>2009-07-18 06:20:01 -0400
commit45bceffc3013bda7d2ebc7802e9b153b674e2d44 (patch)
tree222d7dd8fd300925cbf12cdc0fba5bee2528997e /drivers/base/devres.c
parent6f2f3cf00ee32f75ba007a46bab88a54d68a5deb (diff)
parent78af08d90b8f745044b1274430bc4bc6b2b27aca (diff)
Merge branch 'linus' into tracing/core
Merge reason: tracing/core was on an older, pre-rc1 base. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/base/devres.c')
-rw-r--r--drivers/base/devres.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/devres.c b/drivers/base/devres.c
index e8beb8e5b626..05dd307e8f02 100644
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
@@ -428,6 +428,9 @@ int devres_release_all(struct device *dev)
428{ 428{
429 unsigned long flags; 429 unsigned long flags;
430 430
431 /* Looks like an uninitialized device structure */
432 if (WARN_ON(dev->devres_head.next == NULL))
433 return -ENODEV;
431 spin_lock_irqsave(&dev->devres_lock, flags); 434 spin_lock_irqsave(&dev->devres_lock, flags);
432 return release_nodes(dev, dev->devres_head.next, &dev->devres_head, 435 return release_nodes(dev, dev->devres_head.next, &dev->devres_head,
433 flags); 436 flags);