aboutsummaryrefslogtreecommitdiffstats
path: root/block/bsg.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-14 11:37:46 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-14 11:37:46 +0200
commitd59fdcf2ac501de99c3dfb452af5e254d4342886 (patch)
treead5e2efd6f8aacf2a08b1ed8a54ddf96642e83f3 /block/bsg.c
parentx86: make 64bit hpet_set_mapping to use ioremap too, v2 (diff)
parentLinux 2.6.26 (diff)
downloadlinux-dev-d59fdcf2ac501de99c3dfb452af5e254d4342886.tar.xz
linux-dev-d59fdcf2ac501de99c3dfb452af5e254d4342886.zip
Merge commit 'v2.6.26' into x86/core
Diffstat (limited to 'block/bsg.c')
-rw-r--r--block/bsg.c3
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)