From bc6d1fc89c101e8c23f5f87de6f686372d87cb77 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sun, 23 Aug 2009 18:09:05 +0200
Subject: [PATCH] --- yaml --- r: 157008 b: refs/heads/master c:
 cf05b824dbb871159e1b4c4f2733b9c9d2f756cf h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/s390/block/dasd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 36f0ab747193..de874249e649 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06739a8ad321b1e5140b318c648b0cc4bf8c6daa
+refs/heads/master: cf05b824dbb871159e1b4c4f2733b9c9d2f756cf
diff --git a/trunk/drivers/s390/block/dasd.c b/trunk/drivers/s390/block/dasd.c
index 749836668655..3f62dd50bbbe 100644
--- a/trunk/drivers/s390/block/dasd.c
+++ b/trunk/drivers/s390/block/dasd.c
@@ -2135,9 +2135,9 @@ static int dasd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 	struct dasd_device *base;
 
 	block = bdev->bd_disk->private_data;
-	base = block->base;
 	if (!block)
 		return -ENODEV;
+	base = block->base;
 
 	if (!base->discipline ||
 	    !base->discipline->fill_geometry)