diff --git a/[refs] b/[refs]
index a6bf30737258..727c1d802650 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67e27c741339faedcc8e9c2c613487745d1c4b8b
+refs/heads/master: 8c89ddd536bbe97c1e50424778a139abbf5763c3
diff --git a/trunk/drivers/media/media-devnode.c b/trunk/drivers/media/media-devnode.c
index af5263c6625a..7b42ace419d9 100644
--- a/trunk/drivers/media/media-devnode.c
+++ b/trunk/drivers/media/media-devnode.c
@@ -213,14 +213,14 @@ int __must_check media_devnode_register(struct media_devnode *mdev)
 
 	/* Part 1: Find a free minor number */
 	mutex_lock(&media_devnode_lock);
-	minor = find_next_zero_bit(media_devnode_nums, 0, MEDIA_NUM_DEVICES);
+	minor = find_next_zero_bit(media_devnode_nums, MEDIA_NUM_DEVICES, 0);
 	if (minor == MEDIA_NUM_DEVICES) {
 		mutex_unlock(&media_devnode_lock);
 		printk(KERN_ERR "could not get a free minor\n");
 		return -ENFILE;
 	}
 
-	set_bit(mdev->minor, media_devnode_nums);
+	set_bit(minor, media_devnode_nums);
 	mutex_unlock(&media_devnode_lock);
 
 	mdev->minor = minor;