diff --git a/[refs] b/[refs]
index 573a8ec60f26..53b64bc85e0c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58e323cf5e4ed621a6e88263aca40c3d9c3d9bfd
+refs/heads/master: ccf31c10f125ab5233c8517f91d4b3bd0bd60936
diff --git a/trunk/fs/logfs/dev_mtd.c b/trunk/fs/logfs/dev_mtd.c
index cafb6ef2e05b..b02a4020241a 100644
--- a/trunk/fs/logfs/dev_mtd.c
+++ b/trunk/fs/logfs/dev_mtd.c
@@ -250,5 +250,7 @@ int logfs_get_sb_mtd(struct file_system_type *type, int flags,
 	const struct logfs_device_ops *devops = &mtd_devops;
 
 	mtd = get_mtd_device(NULL, mtdnr);
+	if (IS_ERR(mtd))
+		return PTR_ERR(mtd);
 	return logfs_get_sb_device(type, flags, mtd, NULL, devops, mnt);
 }