Merge commit 'v2.6.26' into x86/core

1 files changed, 2 insertions, 1 deletions

diff --git a/block/bsg.c b/block/bsg.c
index f0b7cd343216..54d617f7df3e 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -709,11 +709,12 @@ static void bsg_kref_release_function(struct kref *kref)
 {
         struct bsg_class_device *bcd =
                 container_of(kref, struct bsg_class_device, ref);
+        struct device *parent = bcd->parent;
 
         if (bcd->release)
                 bcd->release(bcd->parent);
 
-        put_device(bcd->parent);
+        put_device(parent);
 }
 
 static int bsg_put_device(struct bsg_device *bd)