diff --git a/[refs] b/[refs]
index ae38f2e6ea96..be9c45a71e9b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2d0aa5bf8d4f7ae4cb1a7feebf5b1afddd0b9b0
+refs/heads/master: 6a2aae06cc1e87e9712a26a639f6a2f3442e2027
diff --git a/trunk/fs/block_dev.c b/trunk/fs/block_dev.c
index bc8f27cc4483..702b88cbd91d 100644
--- a/trunk/fs/block_dev.c
+++ b/trunk/fs/block_dev.c
@@ -1131,6 +1131,8 @@ static int blkdev_open(struct inode * inode, struct file * filp)
 	filp->f_flags |= O_LARGEFILE;
 
 	bdev = bd_acquire(inode);
+	if (bdev == NULL)
+		return -ENOMEM;
 
 	res = do_open(bdev, filp, BD_MUTEX_NORMAL);
 	if (res)