diff --git a/[refs] b/[refs]
index 72fde372e70e..fcafb637305a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79d0b7f0e30e803061aa1660602a94c118c0c293
+refs/heads/master: 7414d4f64b73cc30c600b4fe0a9cbc24cedc4285
diff --git a/trunk/drivers/block/swim3.c b/trunk/drivers/block/swim3.c
index 57763c54363a..758f2ac878cf 100644
--- a/trunk/drivers/block/swim3.c
+++ b/trunk/drivers/block/swim3.c
@@ -1090,10 +1090,13 @@ static const struct block_device_operations floppy_fops = {
 static void swim3_mb_event(struct macio_dev* mdev, int mb_state)
 {
 	struct floppy_state *fs = macio_get_drvdata(mdev);
-	struct swim3 __iomem *sw = fs->swim3;
+	struct swim3 __iomem *sw;
 
 	if (!fs)
 		return;
+
+	sw = fs->swim3;
+
 	if (mb_state != MB_FD)
 		return;