diff --git a/[refs] b/[refs]
index 3aaea3212dfa..89fa398a39ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54d822a6169b76b807b8cdbbf76ff2812a88947f
+refs/heads/master: 5f4f0c4d3fc95cb7d509e4469a22aed40532f0fc
diff --git a/trunk/block/compat_ioctl.c b/trunk/block/compat_ioctl.c
index 3098c92402fd..3d3e7a46f38c 100644
--- a/trunk/block/compat_ioctl.c
+++ b/trunk/block/compat_ioctl.c
@@ -582,8 +582,6 @@ static int compat_blk_trace_setup(struct block_device *bdev, char __user *arg)
 static int compat_blkdev_driver_ioctl(struct block_device *bdev, fmode_t mode,
 			unsigned cmd, unsigned long arg)
 {
-	int ret;
-
 	switch (cmd) {
 	case HDIO_GET_UNMASKINTR:
 	case HDIO_GET_MULTCOUNT: