diff --git a/[refs] b/[refs]
index 15b64c6337dd..672e217c5947 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2b9857eee17797541b845782ade4d7a9d50f843
+refs/heads/master: a30427d92d0bc152b833088e4a305bbeb1a0c162
diff --git a/trunk/fs/char_dev.c b/trunk/fs/char_dev.c
index 68e510b88457..a54d69369b2f 100644
--- a/trunk/fs/char_dev.c
+++ b/trunk/fs/char_dev.c
@@ -373,6 +373,8 @@ static int chrdev_open(struct inode *inode, struct file *filp)
 			return -ENXIO;
 		new = container_of(kobj, struct cdev, kobj);
 		spin_lock(&cdev_lock);
+		/* Check i_cdev again in case somebody beat us to it while
+		   we dropped the lock. */
 		p = inode->i_cdev;
 		if (!p) {
 			inode->i_cdev = p = new;